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

[Alexei Starovoitov]

On Mon, Feb 2, 2026 at 8:19 AM Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
>
> On Mon, 2 Feb 2026 14:30:14 +0000
> Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
>
> Thanks Mark, the fix looks good to me. The conflict was caused by ftrace
> doing a small change that was recommended by Alexei so I hope this isn't a
> complex conflict ;-)

yep.
Conflict resolution is correct.

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.