Merge branch 'x86/urgent' into perf/core, to resolve conflict

Browse source

Resolve an MSR enumeration conflict.

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2023-10-11 22:48:46 +02:00

parent 25e5684782 f454b18e07

commit 8f4156d587

5 changed files with 74 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

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

View file

8

arch/x86/kernel/cpu/amd.c

View file

10

arch/x86/kernel/cpu/resctrl/monitor.c

View file

69

arch/x86/kernel/sev-shared.c

View file

3

arch/x86/kernel/sev.c

View file