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

[Kees Cook]

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