From: Steven Rostedt <rostedt@goodmis.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Beau Belgrave <beaub@linux.microsoft.com>,
Tom Zanussi <zanussi@kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [GIT PULL] tracing: Updates for 5.18
Date: Wed, 23 Mar 2022 15:43:38 -0400 [thread overview]
Message-ID: <20220323154338.200882ac@gandalf.local.home> (raw)
In-Reply-To: <CAHk-=wiNzTuFN0gCitdkPna0h3MM-ScZhgS_O0NKA5=mcuZCVQ@mail.gmail.com>
On Wed, 23 Mar 2022 12:20:33 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Wed, Mar 23, 2022 at 11:56 AM Linus Torvalds
> <torvalds@linux-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
next prev parent reply other threads:[~2022-03-23 19:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 14:56 Steven Rostedt
2022-03-23 18:47 ` Linus Torvalds
2022-03-23 19:39 ` Steven Rostedt
2022-03-23 18:56 ` Linus Torvalds
2022-03-23 19:20 ` Linus Torvalds
2022-03-23 19:43 ` Steven Rostedt [this message]
2022-03-23 19:49 ` Linus Torvalds
2022-03-24 23:05 ` Steven Rostedt
2022-03-23 19:26 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220323154338.200882ac@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=beaub@linux.microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=zanussi@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®