Re: FAILED: patch "[PATCH] perf/x86/intel: Fix PEBS data source interpretation on" failed to apply to 4.5-stable tree

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Wed, Apr 13, 2016 at 09:54:14AM +0200, Ingo Molnar wrote:
> 
> * Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
> > On Sat, Apr 9, 2016 at 11:13 AM, Andi Kleen <ak@linux.intel.com> wrote:
> > >
> > > Unfortunately perf decided to rename all x86 files, completely
> > > disregarding the needs for backports.
> > 
> > So I agree that renaming tends to make backports nastier.
> 
> Yeah, and unfortunately there's no other way to do such changes, and the directory 
> structure of the x86 drivers of perf grew really badly structured so we had to fix 
> it.
> 
> In perf we go out on a limb to help backports, I regularly add Cc: stable tags.
> 
> In this case we made the renames in a single go to not make backporting a constant 
> drip-drip pain, and we made it all as plain as possible, the pattern is very 
> visible in the shortlogs as well:
> 
> 27f6d22b037b perf/x86: Move perf_event.h to its new home
> 65a27a3510c8 perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c
> 5e865ed44b39 perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c
> f03e97dbd2bb perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.c
> edbb591870dc perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.c
> ed367e6ca427 perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
> 92553e40c629 perf/x86: Move perf_event_intel_uncore_snb.c   => x86/events/intel/uncore_snb.c
> 35bf705c25e8 perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
> 6bcb2db547be perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]
> 609d809f832d perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
> fd1c601c2578 perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
> c85cc4497f82 perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.c
> 7010d129137a perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.c
> 6aec1ad73656 perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c
> 5c781a3daa30 perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.c
> e1069839dd68 perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
> af5d3aabc04a perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c
> d0af1c0525d5 perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c
> 5b26547dd7fa perf/x86: Move perf_event_amd_iommu.[ch] .. => x86/events/amd/iommu.[ch]
> 218cfe4ed888 perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c
> 39b0332a2158 perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c
> fa9cbf320e99 perf/x86: Move perf_event.c ............... => x86/events/core.c

To be honest, using 'git cherry-pick' solved all of my problems here, so
I'll not complain about renames anymore, or at least not for these files
:)

thanks,

greg k-h