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)
commit47319846a9e2ab1c4d22108e891818d003615bd8
tree919dbed5c01d3ad4db009bd38bb12cfd3d038246
parent3d47083b9ff46863e8374ad3bb5edb5e464c75f8
parent672c0c5173427e6b3e2a9bbb7be51ceeec78093a
Merge branch 'v5.18-rc5'

Obtain the new INTEL_FAM6 stuff required.

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