[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220323154338.200882ac@gandalf.local.home>
Date: Wed, 23 Mar 2022 15:43:38 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Beau Belgrave <beaub@...ux.microsoft.com>,
Tom Zanussi <zanussi@...nel.org>,
Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [GIT PULL] tracing: Updates for 5.18
On Wed, 23 Mar 2022 12:20:33 -0700
Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> On Wed, Mar 23, 2022 at 11:56 AM Linus Torvalds
> <torvalds@...ux-foundation.org> wrote:
> >
> > Anyway, when I actually compare my resolution to what is in
> > linux-next, it turns out they are fairly different.
>
> Actually, my resolution is fairly similar - but not identical - to
> linux-next, but quite different from the one I find in your branch. I
> just got confused by having looked at both.
I'll take a look at yours. I gave that branch to Stephen to help him resolve
it, but didn't look at what he had done to see if it was different.
I didn't merge against your branch because when I did the pull request you
didn't have the nfsd tree in yet.
-- Steve
Powered by blists - more mailing lists