Merge branch 'x86/urgent' into perf/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 11 Oct 2023 20:48:46 +0000 (22:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 11 Oct 2023 20:54:03 +0000 (22:54 +0200)
commit8f4156d58713b058e9aeebb28ffbe5f45ae57b47
treef4fd0167e871eeb1dea4a2387e59d348960b69e9
parent25e56847821f7375bdee7dae1027c7917d07ce4b
parentf454b18e07f518bcd0c05af17a2239138bff52de
Merge branch 'x86/urgent' into perf/core, to resolve conflict

Resolve an MSR enumeration conflict.

Conflicts:
arch/x86/include/asm/msr-index.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/msr-index.h