Re: [GIT PULL] tracing: Updates for 5.16

[Linus Torvalds]

On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
>
> Also, this pull request will conflict with your tree against a fix I had
> for trace recursions. I did the conflict resolution and pushed it to my
> ftrace/conflicts branch if you want to reference it.

In the meantime, my tree had grown a few more conflicts elsewhere, but
it all looked fairly straightforward.

It might be a good idea if you were to double-check that everything
looks good, though.

                    Linus