From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55267 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbbFZFjr (ORCPT ); Fri, 26 Jun 2015 01:39:47 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8845021B25 for ; Fri, 26 Jun 2015 01:39:46 -0400 (EDT) Date: Thu, 25 Jun 2015 21:11:40 -0700 From: Greg KH To: Ingo Molnar Cc: stable kernel team Subject: Re: Please merge perf fixes into v4.1.1 Message-ID: <20150626041140.GA30142@kroah.com> References: <20150623072840.GA23046@gmail.com> <20150624134124.GA10550@gmail.com> <20150624144729.GA17352@kroah.com> <20150625070121.GB9388@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150625070121.GB9388@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Jun 25, 2015 at 09:01:21AM +0200, Ingo Molnar wrote: > > * Greg KH wrote: > > > On Wed, Jun 24, 2015 at 03:41:24PM +0200, Ingo Molnar wrote: > > > > > > hi Greg, > > > > > > * Ingo Molnar 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, all now queued up. greg k-h