linux-kernel - Re: linux-next: manual merge of the kspp tree with the mm 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: <20240222091131.5a85973927496f49af32123a@linux-foundation.org>
Date: Thu, 22 Feb 2024 09:11:31 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Kees Cook <keescook@...omium.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 kspp tree with the mm tree

On Thu, 22 Feb 2024 16:41:12 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the kspp tree got conflicts in:
> 
>   scripts/Makefile.lib
>   scripts/Makefile.ubsan
> 
> between commit:
> 
>   1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer")
> 
> from the kspp tree.

Thanks, I'll drop the mm.git copy.