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

Message-ID: <202405131148.A2D10C2320@keescook>
Date: Mon, 13 May 2024 11:50:14 -0700
From: Kees Cook <keescook@...omium.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Masahiro Yamada <masahiroy@...nel.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 kbuild tree

On Mon, May 13, 2024 at 03:13:16PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   drivers/misc/lkdtm/Makefile
> 
> between commit:
> 
>   9cf51a6d1de0 ("Makefile: remove redundant tool coverage variables")

Ah! Interesting. I have replied to that tread now:
https://lore.kernel.org/lkml/202405131136.73E766AA8@keescook/

> 
> from the kbuild tree and commit:
> 
>   fb28a8862dc4 ("lkdtm: Disable CFI checking for perms functions")
> 
> from the kspp tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This

Thanks, this looks correct to me.

-- 
Kees Cook