From: Kees Cook <kees@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the origin tree
Date: Tue, 10 Feb 2026 15:43:04 -0800 [thread overview]
Message-ID: <202602101542.AA78E518@keescook> (raw)
In-Reply-To: <aYueRmtXzWX5UGf2@sirena.org.uk>
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
prev parent reply other threads:[~2026-02-10 23:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-10 21:08 linux-next: manual merge of the kspp tree with the origin tree Mark Brown
2026-02-10 23:43 ` Kees Cook [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202602101542.AA78E518@keescook \
--to=kees@kernel.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox