Hi all, Today's linux-next merge of the gpio tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.yaml between commit: 9d022be3c192 ("dt-bindings: Document yna vendor-prefix.") from the mips tree and commit: 885503fbea21 ("dt-bindings: Add Xylon vendor prefix") from the gpio 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 b44257d0e16e,9cb3bc683db7..000000000000 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@@ -1082,8 -1060,8 +1082,10 @@@ patternProperties description: Xilinx "^xunlong,.*": description: Shenzhen Xunlong Software CO.,Limited + "^yna,.*": + description: YSH & ATIL + "^xylon,.*": + description: Xylon "^yones-toptech,.*": description: Yones Toptech Co., Ltd. "^ysoft,.*":
Attachment:
pgpR8xpe4ypWP.pgp
Description: OpenPGP digital signature