--- v8
+++ v10
@@ -1,4 +1,4 @@
-From: "Jonathan (Zhixiong) Zhang" <zjzhang-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+From: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org>
 
 On a platform with APEI (ACPI Platform Error Interface) enabled, firmware
 updates a memory region with hardware error record using nocache
@@ -16,6 +16,11 @@
 moved from arch/x86 into EFI subsystem and is declared as __weak; archs
 other than ia64 should not override the default implementation.
 
+V10:
+1. Fixed compilation issue on x86.
+V9:
+1. Rebased to arm64-upstream-14543 of arm64/master.
+2. Match strict MM type in arch_apei_get_mem_attribute().
 V8:
 1. For x86, always return PAGE_KERNEL for arch_apei_get_mem_attribute().
    The rational is explained in comment.
@@ -61,16 +66,15 @@
   arm64: apei: implement arch_apei_get_mem_attributes()
   acpi, apei: use appropriate pgprot_t to map GHES memory
 
- arch/arm64/include/asm/acpi.h    | 26 ++++++++++++++++++++++++++
+ arch/arm64/include/asm/acpi.h    | 27 +++++++++++++++++++++++++++
  arch/arm64/include/asm/memory.h  |  1 +
  arch/arm64/include/asm/pgtable.h |  2 ++
  arch/arm64/mm/proc.S             |  4 +++-
- arch/x86/kernel/acpi/apei.c      | 19 +++++++++++++++++++
+ arch/x86/include/asm/acpi.h      | 24 ++++++++++++++++++++++++
  arch/x86/platform/efi/efi.c      | 18 ------------------
  drivers/acpi/apei/ghes.c         |  6 ++++--
  drivers/firmware/efi/efi.c       | 31 +++++++++++++++++++++++++++++++
- include/acpi/apei.h              |  1 +
- 9 files changed, 87 insertions(+), 21 deletions(-)
+ 8 files changed, 92 insertions(+), 21 deletions(-)
 
 -- 
 The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,