linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the csky 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: <CAK7LNARMBiu24R40ChLT7W6sWCsRA+62M71hQw1nnBWquCW7sg@mail.gmail.com>
Date:   Mon, 17 Feb 2020 11:44:48 +0900
From:   Masahiro Yamada <masahiroy@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Guo Ren <ren_guo@...ky.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        MaJun <majun258@...ux.alibaba.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the csky tree

Hi Stephen,

On Mon, Feb 17, 2020 at 10:22 AM Stephen Rothwell <sfr@...b.auug.org.au> 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