Skip to contentSkip to conversation

Please merge perf fixes into v4.1.1

DISCUSSION Ingo Molnar 2 participants 5 messages Jun 23, 2015 – Jun 26, 2015 Stable branch

lore
Share & tools
lore
#0 lore raw

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.

Thanks,

Ingo

#1 lore raw

hi Greg,

Quoted 15 lines · Ingo Molnar

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")

Quoted 2 lines

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")

Thanks,

Ingo

#2 lore raw
Quoted 20 lines · Ingo Molnar

hi Greg,

Quoted 15 lines · Ingo Molnar

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")

Quoted 7 lines
Quoted 2 lines

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?

thanks,

greg k-h

#3 lore raw
Quoted 24 lines · Greg KH
Quoted 23 lines · Ingo Molnar

hi Greg,

Quoted 17 lines · Ingo Molnar

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.

Quoted 7 lines
Quoted 4 lines

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

#4 lore raw
Quoted 41 lines · Ingo Molnar
Quoted 24 lines · Greg KH
Quoted 23 lines · Ingo Molnar

hi Greg,

Quoted 17 lines · Ingo Molnar

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.

Quoted 7 lines
Quoted 4 lines

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")

Quoted 8 lines

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