Merge branch 'x86/cpu' into perf/core, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Thu, 2 May 2024 11:31:29 +0000 (13:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 2 May 2024 11:31:29 +0000 (13:31 +0200)
commit10ed2b118116b4b766c3b0a4f598809af8522b18
treedf515fe75e83ea1834ee2a90d364c814519fdbef
parent690ca3a3067f760bef92ca5db1c42490498ab5de
parent2eda374e883ad297bd9fe575a16c1dc850346075
Merge branch 'x86/cpu' into perf/core, to pick up dependent commits

We are going to fix perf-events fallout of changes in tip:x86/cpu,
so merge in that branch first.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/lbr.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/bugs.c