Re: [GIT PULL] BPF token for v6.8

[Andrii Nakryiko <andrii.nakryiko@gmail.com>]

On Sun, Jan 21, 2024 at 11:27 AM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Thu, 18 Jan 2024 at 21:00, Andrii Nakryiko <andrii@kernel.org> wrote:
> >
> > This time I'm sending them as a dedicated PR. Please let me know if you are OK
> > pull them directly now, or whether I should target it for the next merge
> > window. If the latter is decided, would it be OK to land these patches into
> > bpf-next tree and then include them in a usual bpf-next PR batch?
>
> So I was keeping this pending while I dealt with all the other pulls
> (and dealt with the weather-related fallout here too, of course).
>
> I've now looked through this again, and I'm ok with it, but notice
> that it has been rebased in the last couple of days, which doesn't
> make me all that happy doing a last-minute pull in this merge window.

Yes, I understand. BPF token patches change common (internal) parts of
libbpf, and so there were conflicts with other libbpf-side changes in
the bpf tree.

>
> End result: I think this might as well go through the bpf-next tree
> and come next merge window through the usual channels.

Sounds good, I'll route it through bpf-next, then. Thanks!

>
> I think Christian's concerns were sorted out too, but in case I'm
> mistaken, just holler.

I believe they were, yes.

>
>                   Linus