linux-kernel - Re: linux-next: manual merge of the mm tree with the kspp 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <202208311050.60A8E9C43@keescook>
Date:   Wed, 31 Aug 2022 10:51:08 -0700
From:   Kees Cook <keescook@...omium.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Bart Van Assche <bvanassche@....org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the kspp tree

On Tue, Aug 30, 2022 at 05:00:51PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mm tree got a conflict in:
> 
>   lib/Makefile
> 
> between commit:
> 
>   5e3ad11bfc5a ("testing/selftests: Add tests for the is_signed_type() macro")
> 
> from the kspp tree and commit:
> 
>   7a2791666971 ("testing/selftests: add tests for the is_signed_type() macro")
> 
> from the mm tree.
> 
> I fixed it up (I dropped the latter commit by using the former version
> of this file and deleting lib/is_signed_type_test.c) 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! Andrew, can you drop these patches from -mm please? I corrected
the filename convention in the above named patch.

-- 
Kees Cook