From: Andi Kleen <ak@linux.intel.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
stable <stable@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: FAILED: patch "[PATCH] perf/x86/intel: Fix PEBS data source interpretation on" failed to apply to 4.5-stable tree
Date: Sat, 9 Apr 2016 20:50:18 -0700 [thread overview]
Message-ID: <20160410035018.GC2336@tassilo.jf.intel.com> (raw)
In-Reply-To: <CA+55aFy3cjGD-tWMz9tjykKOTUT7T=edJ16gPanMDr4MQS_tqQ@mail.gmail.com>
On Sat, Apr 09, 2016 at 12:12:28PM -0700, Linus Torvalds wrote:
> > For perf backports you have to run
>
> So a plain "git cherry-pick" will get it right too, simply because it
> does a three-way merge rather than just applying a patch - so you get
> all the usual git rename detection etc.
It doesn't work for git rebase at least. I had to fix up a lot of my
WIP perf feature branches manually :-/
-Andi
next prev parent reply other threads:[~2016-04-10 3:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-09 17:47 FAILED: patch "[PATCH] perf/x86/intel: Fix PEBS data source interpretation on" failed to apply to 4.5-stable tree gregkh
2016-04-09 18:13 ` Andi Kleen
2016-04-09 19:12 ` Linus Torvalds
2016-04-10 3:50 ` Andi Kleen [this message]
2016-04-10 4:34 ` Linus Torvalds
2016-04-13 7:54 ` Ingo Molnar
2016-04-13 14:10 ` Greg Kroah-Hartman
2016-04-10 18:28 ` Greg KH
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=20160410035018.GC2336@tassilo.jf.intel.com \
--to=ak@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.