From: Mark Brown <broonie@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>
Cc: KBuild Mailing List <linux-kbuild@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <ljs@kernel.org>, Nicolas Schier <nsc@kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the kbuild tree
Date: Thu, 15 Oct 2026 23:03:00 +0100 [thread overview]
Message-ID: <0cff4ea9-3476-4d7c-a403-6016830c2bd7@sirena.org.uk> (raw)
In-Reply-To: <20261015212815.GA319266@ax162>
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
On Thu, Oct 15, 2026 at 02:28:15PM -0700, Nathan Chancellor wrote:
> On Mon, Oct 05, 2026 at 03:37:49PM +0200, Mark Brown wrote:
> > Done.
> This seems to have made its way back into -next, it is currently in the
> efi merge:
> aa5bcff53709 ("Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git")
> I have the following applied locally on top of next-20261015.
Ugh, this is going to keep coming back with git rerere every time
there's a textually identical conflict, it's not something I'm manually
doing. I guess it'll stop happening after the merge window.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-10-15 22:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-02 22:42 Mark Brown
2026-10-02 23:06 ` Nathan Chancellor
2026-10-02 23:11 ` Mark Brown
2026-10-05 13:32 ` Nathan Chancellor
2026-10-05 13:37 ` Mark Brown
2026-10-15 21:28 ` Nathan Chancellor
2026-10-15 22:03 ` Mark Brown [this message]
2026-10-16 12:53 ` Mark Brown
2026-10-03 6:43 ` Alexei Starovoitov
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=0cff4ea9-3476-4d7c-a403-6016830c2bd7@sirena.org.uk \
--to=broonie@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=nathan@kernel.org \
--cc=nsc@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
all inboxes | Powered by JetHome®