From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail-wi0-f169.google.com ([209.85.212.169]:37900 "EHLO
	mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751083AbbFYHBZ (ORCPT
	<rfc822;stable@vger.kernel.org>); Thu, 25 Jun 2015 03:01:25 -0400
Received: by wibdq8 with SMTP id dq8so66408405wib.1
        for <stable@vger.kernel.org>; Thu, 25 Jun 2015 00:01:24 -0700 (PDT)
Date: Thu, 25 Jun 2015 09:01:21 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Greg KH <greg@kroah.com>
Cc: stable kernel team <stable@vger.kernel.org>
Subject: Re: Please merge perf fixes into v4.1.1
Message-ID: <20150625070121.GB9388@gmail.com>
References: <20150623072840.GA23046@gmail.com>
 <20150624134124.GA10550@gmail.com>
 <20150624144729.GA17352@kroah.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150624144729.GA17352@kroah.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>


* Greg KH <greg@kroah.com> wrote:

> On Wed, Jun 24, 2015 at 03:41:24PM +0200, Ingo Molnar wrote:
> > 
> > hi Greg,
> > 
> > * Ingo Molnar <mingo@kernel.org> wrote:
> > 
> > > hi Greg,
> > > 
> > > Please merge the following upstream perf commits into v4.1.1:
> > > 
> > >   git merge 75e84ab906ef
> > > 
> > > This will merge the following fixes:
> > > 
> > >   2f993cf09364 ("perf: Fix ring_buffer_attach() RCU sync, again")
> > >   4b36f1a4139c ("perf/x86: Add more Broadwell model numbers")
> > >   6b099d9b040b ("perf/x86/intel/bts: Fix DS area sharing with x86_pmu events")
> > >   1b7b938f1817 ("perf/x86/intel: Fix PMI handling for Intel PT")
> > >   2c33645d366d ("perf/x86: Honor the architectural performance monitoring version")
> > >   75e84ab906ef ("perf tools: Fix build breakage if prefix= is specified")
> > > 
> > > Note: commit IDs are listed in cherry picking order, in case you want to 
> > > cherry-pick them.
> > 
> > Please disregard all these sha1's for the time being, as a regression has just 
> > been bisected back to:
> > 
> >    1b7b938f1817 ("perf/x86/intel: Fix PMI handling for Intel PT")
> 
> Ok, should I just ignore all of these then?  Don't you want the other
> patches before that one merged?

Yeah, so you can apply:

   2f993cf09364 ("perf: Fix ring_buffer_attach() RCU sync, again")
   4b36f1a4139c ("perf/x86: Add more Broadwell model numbers")
   6b099d9b040b ("perf/x86/intel/bts: Fix DS area sharing with x86_pmu events")

And in fact you can apply these two too:

   2c33645d366d ("perf/x86: Honor the architectural performance monitoring version")
   75e84ab906ef ("perf tools: Fix build breakage if prefix= is specified")

as they are independent.

It's only 1b7b938f1817 that was borked.

Thanks,

	Ingo