[lkml]   [2020]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the gpio tree with the mips tree
Hi all,

Today's linux-next merge of the gpio tree got a conflict in:


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.

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
description: Shenzhen Xunlong Software CO.,Limited
+ "^yna,.*":
+ description: YSH & ATIL
+ "^xylon,.*":
+ description: Xylon
description: Yones Toptech Co., Ltd.
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2020-01-10 05:52    [W:0.062 / U:8.956 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site