linux-kernel - Re: linux-next: manual merge of the imx-mxs tree with the arm-soc 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: <20180327075520.GA3245@dragon>
Date:   Tue, 27 Mar 2018 15:55:22 +0800
From:   Shawn Guo <shawn.guo@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Olof Johansson <olof@...om.net>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Fabio Estevam <fabio.estevam@....com>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm-soc
 tree

On Tue, Mar 27, 2018 at 09:10:26AM +1100, Stephen Rothwell wrote:
> Hi Shawn,
> 
> Today's linux-next merge of the imx-mxs tree got a conflict in:
> 
>   arch/arm/configs/mxs_defconfig
> 
> between commit:
> 
>   e3e583e7a293 ("ARM: mxs_defconfig: Re-sync defconfig")
> 
> from the arm-soc tree and commit:
> 
>   8bc2c29b550c ("ARM: mxs_defconfig: Re-sync defconfig")
> 
> from the imx-mxs tree.
> 
> I fixed it up (I just used the latter version) 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, Stephen.  We will sort this out on arm-soc tree.

Arnd,

You pulled "[GIT PULL 6/6] i.MX defconfig updates for 4.17" [1]?
I thought you did not pull it, and updated it with v2 to address your
comment.  Let me know which one you want to send upstream.  Thanks.

Shawn

[1] https://patchwork.ozlabs.org/patch/886191/