lkml.org 
[lkml]   [2019]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the rockchip tree with the amlogic tree
Hi Stephen,

On Wed, Apr 24, 2019 at 1:31 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> 029da5e5266c ("ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers")
>
> from the amlogic tree and commit:
>
> 366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
>
> from the rockchip 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.
I just checked the result in next-20190426 and it looks fine
thank you for taking care of this!

do you need anything from me (Acked-by, etc.) to avoid any issues
during the merge for Linus and/or the ARM maintainers?


Regards
Martin

\
 
 \ /
  Last update: 2019-04-26 21:26    [W:0.167 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site