Merge branch 'x86/mce' into x86/ras

Pursue a single RAS/MCE topic branch on x86.

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

diff --cc arch/x86/include/asm/acpi.h
Simple merge

diff --cc arch/x86/include/asm/mce.h
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce_intel.c
Simple merge

diff --cc drivers/acpi/apei/ghes.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/memory-failure.c
Simple merge