linux-kernel - Re: linux-next: manual merge of the gpio tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200113091237.GA1748@aptenodytes>
Date:   Mon, 13 Jan 2020 10:12:37 +0100
From:   Paul Kocialkowski <paul.kocialkowski@...tlin.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linus Walleij <linus.walleij@...aro.org>,
        Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        周琰杰 (Zhou Yanjie) 
        <zhouyanjie@...yeetech.com>, Paul Burton <paulburton@...nel.org>
Subject: Re: 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

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)