From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga02.intel.com ([134.134.136.20]:48121 "EHLO mga02.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752172AbcDJDuU (ORCPT <rfc822;stable@vger.kernel.org>);
	Sat, 9 Apr 2016 23:50:20 -0400
Date: Sat, 9 Apr 2016 20:50:18 -0700
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
Message-ID: <20160410035018.GC2336@tassilo.jf.intel.com>
References: <1460224049186237@kroah.com>
 <20160409181312.GB2336@tassilo.jf.intel.com>
 <CA+55aFy3cjGD-tWMz9tjykKOTUT7T=edJ16gPanMDr4MQS_tqQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+55aFy3cjGD-tWMz9tjykKOTUT7T=edJ16gPanMDr4MQS_tqQ@mail.gmail.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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