Re: linux-next: manual merge of the akpm-current tree with the csky tree

[Masahiro Yamada]

Hi Stephen,

On Mon, Feb 17, 2020 at 10:22 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
>   arch/csky/include/asm/Kbuild
>
> between commit:
>
>   aeb58bb21421 ("csky: Add PCI support")
>
> from the csky tree and commit:
>
>   25e6e2bca62a ("asm-generic: make more kernel-space headers mandatory")
>
> from the akpm-current tree.
>
> I fixed it up (the latter is a superset of the former) and can carry the
> fix as necessary.


Correct. The latter is a superset.

Andrew sends rebased patches to Linus,
so it should be probably fine.

Thanks.


> 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



-- 
Best Regards
Masahiro Yamada