linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the kbuild 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: <20210408203633.08012e20@canb.auug.org.au>
Date:   Thu, 8 Apr 2021 20:36:32 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Piotr Gorski <lucjan.lucjanov@...il.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 kbuild tree

Hi all,

On Thu, 8 Apr 2021 20:34:49 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   Makefile

This also affected init/Kconfig

> between commit:
> 
>   2f8864dbe668 ("kbuild: move module strip/compression code into scripts/Makefile.modinst")
> 
> from the kbuild tree and commit:
> 
>   7b35c1a01c2e ("init: add support for zstd compressed modules")
> 
> from the akpm-current tree.
> 
> Also commit
> 
>   ee2305118fc3 ("kbuild: add support for zstd compressed modules")
> 
> from the kbuild tree seems to do the same as the akpm-current commit
> above, so I just effectively reverted the akpm-current commit.
> 
> I fixed it up (see above) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped