lkml.org 
[lkml]   [2020]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the gpio tree with the mips tree
Hi,

On Fri 10 Jan 20, 15:51, Stephen Rothwell wrote:
> 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.

Thanks for the fix. We might want to keep the list ordered though, with
"xylon" listed after "xunlong" and before "yna".

> --
> 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

So reversing the two blocks above.

What do you think?

Cheers,

Paul

> "^yones-toptech,.*":
> description: Yones Toptech Co., Ltd.
> "^ysoft,.*":



--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-01-13 10:13    [W:0.075 / U:3.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site