Merge branch 'tip/perf/urgent'
authorPeter Zijlstra <peterz@infradead.org>
Wed, 15 Nov 2023 09:15:40 +0000 (10:15 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 15 Nov 2023 09:15:40 +0000 (10:15 +0100)
commit5d2d4a9f603a47403395408f64b1261ca61f6d50
tree52d145a53bfe4f32a20bb621ac848623ae459510
parent33744916196b4ed7a50f6f47af7c3ad46b730ce6
parent889c58b3155ff4c8e8671c95daef63d6fabbb6b1
Merge branch 'tip/perf/urgent'

Avoid conflicts, base on fixes.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
arch/powerpc/perf/core-book3s.c
arch/x86/include/asm/msr-index.h
include/linux/perf_event.h
kernel/events/core.c