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

[Mark Brown]

On Tue, Nov 03, 2026 at 05:40:04PM +0000, Alexei Starovoitov wrote:
> On Tue Nov 3, 2026 at 2:08 PM UTC, Mark Brown wrote:

> > and likely others from the bpf-next tree.  Given the nature of the
> > conflict and my total lack of familiarity with this code it seems
> > vanishingly unlikely that I'd be able to do a sensible merge here,
> > instead I will hold the bpf-next tree at the version from next-20261102.
> > If someone could help me out with the merge here that would be very much
> > appreciated.

> Yep. It wasn't easy.
> bpf tree is now ffwded and merged into bpf-next.
> Conflict is resolved.

Thanks!

Attachment: signature.asc
Description: PGP signature