Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core

Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.

diff --cc arch/arm64/Kconfig
index b37ac9b2a36b29a34ab66c7291dcd1c8ae989f1d,80559977a83e7614cbfae84f4ae9a32d6503ca28..b52db8bb1270dc279a5395f0ba6a2d3284e4d196
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -20,8 -19,8 +20,9 @@@ config ARM6
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+       select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA
        select ARCH_USE_CMPXCHG_LOCKREF
 +      select ARCH_SUPPORTS_MEMORY_FAILURE
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_NUMA_BALANCING
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

diff --cc arch/arm64/include/asm/system_misc.h
Simple merge

diff --cc arch/arm64/kernel/pci.c
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge