linux-kernel - Re: linux-next: manual merge of the kspp tree with the origin 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: <202602101542.AA78E518@keescook>
Date: Tue, 10 Feb 2026 15:43:04 -0800
From: Kees Cook <kees@...nel.org>
To: Mark Brown <broonie@...nel.org>
Cc: 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 origin tree

On Tue, Feb 10, 2026 at 09:08:22PM +0000, Mark Brown wrote:
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   scripts/coccinelle/api/kmalloc_objs.cocci
> 
> between commit:
> 
>   bdc5071d7f7bb ("coccinelle: Add kmalloc_objs conversion script")
> 
> from the origin tree and commit:
> 
>   52d3cfa9bfcd4 ("coccinelle: Add kmalloc_objs conversion script")
> 
> from the kspp tree.

Oops! Sorry, I have refreshed the tree now. Thanks!

-- 
Kees Cook