mirror-linux/arch/x86/kernel/cpu/mce
Ingo Molnar 1f82e8e1ca Merge branch 'x86/msr' into x86/core, to resolve conflicts
Conflicts:
	arch/x86/boot/startup/sme.c
	arch/x86/coco/sev/core.c
	arch/x86/kernel/fpu/core.c
	arch/x86/kernel/fpu/xstate.c

 Semantic conflict:
	arch/x86/include/asm/sev-internal.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2025-05-13 10:42:06 +02:00
..
Makefile thermal: Move therm_throt there from x86/mce 2021-02-08 11:43:20 +01:00
amd.c x86/msr: Rename 'wrmsrl()' to 'wrmsrq()' 2025-04-10 11:58:33 +02:00
apei.c x86/mce/apei: Handle variable SMCA BERT record size 2024-10-31 10:45:59 +01:00
core.c x86/msr: Convert __rdmsr() uses to native_rdmsrq() uses 2025-05-02 10:36:35 +02:00
dev-mcelog.c x86/mce/mcelog: Use xchg() to get and clear the flags 2024-10-28 14:07:47 +01:00
genpool.c x86/mce: Make four functions return bool 2024-12-30 22:06:36 +01:00
inject.c Merge branch 'x86/msr' into x86/core, to resolve conflicts 2025-05-13 10:42:06 +02:00
intel.c x86/msr: Rename 'wrmsrl_safe()' to 'wrmsrq_safe()' 2025-04-10 11:58:44 +02:00
internal.h x86/msr: Rename 'mce_rdmsrl()' to 'mce_rdmsrq()' 2025-04-10 11:59:09 +02:00
p5.c x86/mce: Get rid of machine_check_vector 2021-09-23 11:15:49 +02:00
severity.c x86/mce: use is_copy_from_user() to determine copy-from-user context 2025-03-17 22:07:05 -07:00
threshold.c x86/mce/threshold: Remove the redundant this_cpu_dec_return() 2024-12-30 19:45:03 +01:00
winchip.c x86/mce: Get rid of machine_check_vector 2021-09-23 11:15:49 +02:00