From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51159 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891AbcDJS22 (ORCPT ); Sun, 10 Apr 2016 14:28:28 -0400 Date: Sun, 10 Apr 2016 11:28:27 -0700 From: Greg KH To: Andi Kleen Cc: mingo@kernel.org, peterz@infradead.org, stable@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org Subject: Re: FAILED: patch "[PATCH] perf/x86/intel: Fix PEBS data source interpretation on" failed to apply to 4.5-stable tree Message-ID: <20160410182827.GA6139@kroah.com> References: <1460224049186237@kroah.com> <20160409181312.GB2336@tassilo.jf.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160409181312.GB2336@tassilo.jf.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Sat, Apr 09, 2016 at 11:13:12AM -0700, Andi Kleen wrote: > On Sat, Apr 09, 2016 at 10:47:29AM -0700, gregkh@linuxfoundation.org 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 . > > 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