Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
vendor-prefixes.txt") 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 s...@canb.auug.org.au diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index 8319844fb68d,640e86dc0ae7..000000000000 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -65,13 -66,12 +67,13 @@@ snps Synopsys, Inc st STMicroelectronics ste ST-Ericsson stericsson ST-Ericsson - toumaz Toumaz ti Texas Instruments toshiba Toshiba Corporation + toumaz Toumaz v3 V3 Semiconductor via VIA Technologies, Inc. +voipac Voipac Technologies s.r.o. + winbond Winbond Electronics corp. wlf Wolfson Microelectronics wm Wondermedia Technologies, Inc. - winbond Winbond Electronics corp. xlnx Xilinx
pgp30hKKO3qFi.pgp
Description: PGP signature
