Merge branches 'for-next/misc', 'for-next/vmcoreinfo', 'for-next/cpufeature', 'for...

* for-next/misc:
  : Miscellaneous fixes and cleanups
  arm64: use IRQ_STACK_SIZE instead of THREAD_SIZE for irq stack
  arm64/mm: save memory access in check_and_switch_context() fast switch path
  recordmcount: only record relocation of type R_AARCH64_CALL26 on arm64.
  arm64: Reserve HWCAP2_MTE as (1 << 18)
  arm64/entry: deduplicate SW PAN entry/exit routines
  arm64: s/AMEVTYPE/AMEVTYPER
  arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K and 64K configs
  arm64: stacktrace: Move export for save_stack_trace_tsk()
  smccc: Make constants available to assembly
  arm64/mm: Redefine CONT_{PTE, PMD}_SHIFT
  arm64/defconfig: Enable CONFIG_KEXEC_FILE
  arm64: Document sysctls for emulated deprecated instructions
  arm64/panic: Unify all three existing notifier blocks
  arm64/module: Optimize module load time by optimizing PLT counting

* for-next/vmcoreinfo:
  : Export the virtual and physical address sizes in vmcoreinfo
  arm64/crash_core: Export TCR_EL1.T1SZ in vmcoreinfo
  crash_core, vmcoreinfo: Append 'MAX_PHYSMEM_BITS' to vmcoreinfo

* for-next/cpufeature:
  : CPU feature handling cleanups
  arm64/cpufeature: Validate feature bits spacing in arm64_ftr_regs[]
  arm64/cpufeature: Replace all open bits shift encodings with macros
  arm64/cpufeature: Add remaining feature bits in ID_AA64MMFR2 register
  arm64/cpufeature: Add remaining feature bits in ID_AA64MMFR1 register
  arm64/cpufeature: Add remaining feature bits in ID_AA64MMFR0 register

* for-next/acpi:
  : ACPI updates for arm64
  arm64/acpi: disallow writeable AML opregion mapping for EFI code regions
  arm64/acpi: disallow AML memory opregions to access kernel memory

* for-next/perf:
  : perf updates for arm64
  arm64: perf: Expose some new events via sysfs
  tools headers UAPI: Update tools's copy of linux/perf_event.h
  arm64: perf: Add cap_user_time_short
  perf: Add perf_event_mmap_page::cap_user_time_short ABI
  arm64: perf: Only advertise cap_user_time for arch_timer
  arm64: perf: Implement correct cap_user_time
  time/sched_clock: Use raw_read_seqcount_latch()
  sched_clock: Expose struct clock_read_data
  arm64: perf: Correct the event index in sysfs
  perf/smmuv3: To simplify code for ioremap page in pmcg

* for-next/timens:
  : Time namespace support for arm64
  arm64: enable time namespace support
  arm64/vdso: Restrict splitting VVAR VMA
  arm64/vdso: Handle faults on timens page
  arm64/vdso: Add time namespace page
  arm64/vdso: Zap vvar pages when switching to a time namespace
  arm64/vdso: use the fault callback to map vvar pages

* for-next/msi-iommu:
  : Make the MSI/IOMMU input/output ID translation PCI agnostic, augment the
  : MSI/IOMMU ACPI/OF ID mapping APIs to accept an input ID bus-specific parameter
  : and apply the resulting changes to the device ID space provided by the
  : Freescale FSL bus
  bus: fsl-mc: Add ACPI support for fsl-mc
  bus/fsl-mc: Refactor the MSI domain creation in the DPRC driver
  of/irq: Make of_msi_map_rid() PCI bus agnostic
  of/irq: make of_msi_map_get_device_domain() bus agnostic
  dt-bindings: arm: fsl: Add msi-map device-tree binding for fsl-mc bus
  of/device: Add input id to of_dma_configure()
  of/iommu: Make of_map_rid() PCI agnostic
  ACPI/IORT: Add an input ID to acpi_dma_configure()
  ACPI/IORT: Remove useless PCI bus walk
  ACPI/IORT: Make iort_msi_map_rid() PCI agnostic
  ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic
  ACPI/IORT: Make iort_match_node_callback walk the ACPI namespace for NC

* for-next/trivial:
  : Trivial fixes
  arm64: sigcontext.h: delete duplicated word
  arm64: ptrace.h: delete duplicated word
  arm64: pgtable-hwdef.h: delete duplicated words

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/pgtable-hwdef.h
index ce3d14abb36071a2ba753c121ddab5e2dcd6bf2a,9a757d7249743cbf6bd2f43192153912093bedb5,9c91a8f93a0e9e00b2c47f5b329c6e858e39c14a,9c91a8f93a0e9e00b2c47f5b329c6e858e39c14a,9c91a8f93a0e9e00b2c47f5b329c6e858e39c14a,9c91a8f93a0e9e00b2c47f5b329c6e858e39c14a,9c91a8f93a0e9e00b2c47f5b329c6e858e39c14a,b18ba4452873e30188aa7a6f6ea4648ae3bae80a..f5d7f23f14d70c528f451eb00429568a2b382b76
--- 1/arch/arm64/include/asm/pgtable-hwdef.h
--- 2/arch/arm64/include/asm/pgtable-hwdef.h
--- 3/arch/arm64/include/asm/pgtable-hwdef.h
--- 4/arch/arm64/include/asm/pgtable-hwdef.h
--- 5/arch/arm64/include/asm/pgtable-hwdef.h
--- 6/arch/arm64/include/asm/pgtable-hwdef.h
--- 7/arch/arm64/include/asm/pgtable-hwdef.h
--- 8/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@@@@@@@@ -82,23 -82,23 -82,23 -82,23 -82,23 -82,23 -82,23 -82,23 +82,23 @@@@@@@@@
         * Contiguous page definitions.
         */
        #ifdef CONFIG_ARM64_64K_PAGES
 -------#define CONT_PTE_SHIFT          5
 -------#define CONT_PMD_SHIFT          5
 +++++++#define CONT_PTE_SHIFT          (5 + PAGE_SHIFT)
 +++++++#define CONT_PMD_SHIFT          (5 + PMD_SHIFT)
        #elif defined(CONFIG_ARM64_16K_PAGES)
 -------#define CONT_PTE_SHIFT          7
 -------#define CONT_PMD_SHIFT          5
 +++++++#define CONT_PTE_SHIFT          (7 + PAGE_SHIFT)
 +++++++#define CONT_PMD_SHIFT          (5 + PMD_SHIFT)
        #else
 -------#define CONT_PTE_SHIFT          4
 -------#define CONT_PMD_SHIFT          4
 +++++++#define CONT_PTE_SHIFT          (4 + PAGE_SHIFT)
 +++++++#define CONT_PMD_SHIFT          (4 + PMD_SHIFT)
        #endif
        
 -------#define CONT_PTES               (1 << CONT_PTE_SHIFT)
 +++++++#define CONT_PTES               (1 << (CONT_PTE_SHIFT - PAGE_SHIFT))
        #define CONT_PTE_SIZE           (CONT_PTES * PAGE_SIZE)
        #define CONT_PTE_MASK           (~(CONT_PTE_SIZE - 1))
 -------#define CONT_PMDS               (1 << CONT_PMD_SHIFT)
 +++++++#define CONT_PMDS               (1 << (CONT_PMD_SHIFT - PMD_SHIFT))
        #define CONT_PMD_SIZE           (CONT_PMDS * PMD_SIZE)
        #define CONT_PMD_MASK           (~(CONT_PMD_SIZE - 1))
------- /* the the numerical offset of the PTE within a range of CONT_PTES */
+++++++ /* the numerical offset of the PTE within a range of CONT_PTES */
        #define CONT_RANGE_OFFSET(addr) (((addr)>>PAGE_SHIFT)&(CONT_PTES-1))
        
        /*

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

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