On Sat, Apr 09, 2016 at 11:13:12AM -0700, Andi Kleen wrote: > On Sat, Apr 09, 2016 at 10:47:29AM -0700, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > The patch below does not apply to the 4.5-stable tree. > > If someone wants it applied there, or to any other stable or longterm > > tree, then please email the backport, including the original git commit > > id to <stable@xxxxxxxxxxxxxxx>. > > Unfortunately perf decided to rename all x86 files, completely > disregarding the needs for backports. > > For perf backports you have to run > > s#arch/x86/kernel/cpu/perf_event_intel.c#arch/x86/events/intel/core.c#g > s#arch/x86/kernel/cpu/perf_event_intel_#arch/x86/events/intel/#g > s#arch/x86/kernel/cpu/perf_event.c#arch/x86/events/core.c#g > s#arch/x86/kernel/cpu/perf_event_amd.c#arch/x86/events/amd/core.c#g > s#arch/x86/kernel/cpu/perf_event_amd_#arch/x86/events/amd/#g > > over the patch headers. Then things should apply again. Thanks, that worked. Well, I used cherry-pick and then exported the series as patches, but the end-result was the same :) greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html