Re: linux-next: manual merge of the kspp tree with the kbuild tree

Kees Cook
2024-05-13T18:50:15Z

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