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

[Steven Rostedt]

On Mon, 2 Feb 2026 08:42:55 -0800
Alexei Starovoitov <alexei.starovoitov@xxxxxxxxx> wrote:

> I wonder whether we should take the whole srcu_fast in tracepoints
> patch set into bpf-next to avoid this conflict ?
> Probably not worth it in the last week before the merge window.
> Just a thought.

It's already in next where it would require a revert to get rid of.

There's just one patch that touches the bpf code, so it still makes more
sense to keep it in the tracing tree.

-- Steve