linux-kernel - Re: linux-next: manual merge of the staging tree with the imx-mxs 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] [day] [month] [year] [list]

Message-ID: <20190508134727.7ca1e390@canb.auug.org.au>
Date:   Wed, 8 May 2019 13:47:27 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Greg KH <greg@...ah.com>, Shawn Guo <shawn.guo@...aro.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Robert Yang <decatf@...il.com>,
        Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Jonathan Neuschäfer 
        <j.neuschaefer@....net>
Subject: Re: linux-next: manual merge of the staging tree with the imx-mxs
 tree

Hi all,

On Fri, 12 Apr 2019 14:49:21 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   Documentation/devicetree/bindings/vendor-prefixes.txt
> 
> between commit:
> 
>   189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.")
> 
> from the imx-mxs tree and commit:
> 
>   2e5cee6c7622 ("dt-bindings: Add vendor prefix for Kionix, Inc.")
> 
> from the staging 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.txt
> index 5f2b185a04e6,93753f447c20..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -211,7 -210,7 +211,8 @@@ kiebackpeter    Kieback & Peter Gmb
>   kinetic Kinetic Technologies
>   kingdisplay	King & Display Technology Co., Ltd.
>   kingnovel	Kingnovel Technology Co., Ltd.
> + kionix	Kionix, Inc.
>  +kobo	Rakuten Kobo Inc.
>   koe	Kaohsiung Opto-Electronics Inc.
>   kosagi	Sutajio Ko-Usagi PTE Ltd.
>   kyo	Kyocera Corporation

This is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped