Merge branch 'tip/perf/urgent'

Avoid conflicts, base on fixes.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

diff --cc arch/powerpc/perf/core-book3s.c
Simple merge

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge