lkml.org 
[lkml]   [2021]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] tracing: Updates for 5.16
On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt <rostedt@goodmis.org> 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

\
 
 \ /
  Last update: 2021-11-02 04:15    [W:0.052 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site