Hi Rob, Today's linux-next merge of the dt-rh tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
d5553cb05a04 ("ARM: dts: zx: add an initial zx296702 dts and doc")
from the arm-soc tree and commit:
72d942e23cda ("of: Add vendor prefix for Zodiac Inflight Innovations")
from the dt-rh tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell [email protected]
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index a0aa80bb3480,c400c95abc67..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -225,4 -211,4 +225,5 @@@ xillybus Xillybus Ltd
xlnx Xilinx
zyxel ZyXEL Communications Corp.
zarlink Zarlink Semiconductor
+ zii Zodiac Inflight Innovations
+zte ZTE Corp.
pgp1bvpwGtDm4.pgp
Description: OpenPGP digital signature
