From: Peter Zijlstra <peterz@infradead.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Leo Yan <leo.yan@linaro.org>, Ingo Molnar <mingo@redhat.com>,
Will Deacon <will@kernel.org>, Waiman Long <longman@redhat.com>,
Boqun Feng <boqun.feng@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] locking/lockdep: Correct calling tracepoints
Date: Wed, 12 May 2021 18:54:19 +0200 [thread overview]
Message-ID: <YJwIO4h9FaRdrC0o@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20210512111439.5f80f707@gandalf.local.home>
On Wed, May 12, 2021 at 11:14:39AM -0400, Steven Rostedt wrote:
> On Wed, 12 May 2021 16:05:33 +0200
> Peter Zijlstra <peterz@infradead.org> wrote:
>
> > Thing is, if you look at the list copy:
> >
> > https://lore.kernel.org/lkml/20200821085348.782688941@infradead.org/
> >
> > things were okay. I suspect there was a conflict at some point and
> > resolution got it backwards because the hunks are so similar and I never
> > noticed :/
>
> Was this a git merge issue or a quilt merge issue ?
Probably quilt, I never do anything like that with git.
next prev parent reply other threads:[~2021-05-12 19:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 12:09 Leo Yan
2021-05-12 12:37 ` Peter Zijlstra
2021-05-12 13:32 ` Steven Rostedt
2021-05-12 14:05 ` Peter Zijlstra
2021-05-12 15:14 ` Steven Rostedt
2021-05-12 16:54 ` Peter Zijlstra [this message]
2021-05-19 8:09 ` [tip: locking/urgent] " tip-bot2 for Leo Yan
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=YJwIO4h9FaRdrC0o@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=boqun.feng@gmail.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=will@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®