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

[Mark Brown]

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: signature.asc
Description: PGP signature