git.kernelconcepts.de Git - karo-tx-linux.git/commit

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
"These are the left over fixes from the v4.1 cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Fix build breakage if prefix= is specified
  perf/x86: Honor the architectural performance monitoring version
  perf/x86/intel: Fix PMI handling for Intel PT
  perf/x86/intel/bts: Fix DS area sharing with x86_pmu events
  perf/x86: Add more Broadwell model numbers
  perf: Fix ring_buffer_attach() RCU sync, again

author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 22 Jun 2015 22:45:41 +0000 (15:45 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 22 Jun 2015 22:45:41 +0000 (15:45 -0700)
commit	6bc4c3ad3619e1bcb4a6330e030007ace8ca465e
tree	dda9505c22e85417ee752ef90ff7848126cca0f0	tree \| snapshot
parent	c58267e9fa7b0345dd9006939254701e3622ca6a	commit \| diff
parent	0f02adaa49af23ab9fa05375f4a237da6014401b	commit \| diff

arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_intel.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
tools/build/Makefile.build	diff1 \|	diff2 \|	blob \| history