Merge branch 'v5.18-rc5'
authorPeter Zijlstra <peterz@infradead.org>
Wed, 11 May 2022 14:27:06 +0000 (16:27 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 11 May 2022 14:27:06 +0000 (16:27 +0200)
Obtain the new INTEL_FAM6 stuff required.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
1  2 
arch/x86/include/asm/msr-index.h
arch/x86/include/asm/perf_event.h
drivers/acpi/processor_idle.c
kernel/events/core.c

Simple merge
Simple merge
Simple merge
Simple merge