On Thu, Jun 25, 2015 at 09:01:21AM +0200, Ingo Molnar wrote:
>
> * Greg KH <greg@xxxxxxxxx> wrote:
>
> > On Wed, Jun 24, 2015 at 03:41:24PM +0200, Ingo Molnar wrote:
> > >
> > > hi Greg,
> > >
> > > * Ingo Molnar <mingo@xxxxxxxxxx> 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
--
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