Hi all, Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commits:
243167e96939 ("dt-bindings: vendor-prefixes: Add Shanghai FourSemi
Semiconductor Co.,Ltd")
09b26dce32f0 ("dt-bindings: vendor-prefixes: Add Mayqueen name")
from the sound-asoc and drm-misc trees and commit:
4ed46073274a ("dt-bindings: vendor-prefixes: Add undocumented vendor
prefixes")
from the devicetree tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index dcf82d972037,0f5273123650..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -560,8 -568,8 +576,10 @@@ patternProperties
description: FocalTech Systems Co.,Ltd
"^forlinx,.*":
description: Baoding Forlinx Embedded Technology Co., Ltd.
+ "^foursemi,.*":
+ description: Shanghai FourSemi Semiconductor Co.,Ltd.
+ "^foxlink,.*":
+ description: Foxlink Group
"^freebox,.*":
description: Freebox SAS
"^freecom,.*":
@@@ -943,8 -955,8 +967,10 @@@
description: Maxim Integrated Products
"^maxlinear,.*":
description: MaxLinear Inc.
+ "^maxtor,.*":
+ description: Maxtor Corporation
+ "^mayqueen,.*":
+ description: Mayqueen Technologies Ltd.
"^mbvl,.*":
description: Mobiveil Inc.
"^mcube,.*":
pgpRpB9CNXDPr.pgp
Description: OpenPGP digital signature
