lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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/

\
 
 \ /
  Last update: 2018-03-27 09:56    [W:0.198 / U:7.748 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site