Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

Pull arm64 updates from Catalin Marinas:

 - Pseudo NMI support for arm64 using GICv3 interrupt priorities

 - uaccess macros clean-up (unsafe user accessors also merged but
   reverted, waiting for objtool support on arm64)

 - ptrace regsets for Pointer Authentication (ARMv8.3) key management

 - inX() ordering w.r.t. delay() on arm64 and riscv (acks in place by
   the riscv maintainers)

 - arm64/perf updates: PMU bindings converted to json-schema, unused
   variable and misleading comment removed

 - arm64/debug fixes to ensure checking of the triggering exception
   level and to avoid the propagation of the UNKNOWN FAR value into the
   si_code for debug signals

 - Workaround for Fujitsu A64FX erratum 010001

 - lib/raid6 ARM NEON optimisations

 - NR_CPUS now defaults to 256 on arm64

 - Minor clean-ups (documentation/comments, Kconfig warning, unused
   asm-offsets, clang warnings)

 - MAINTAINERS update for list information to the ARM64 ACPI entry

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (54 commits)
  arm64: mmu: drop paging_init comments
  arm64: debug: Ensure debug handlers check triggering exception level
  arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals
  Revert "arm64: uaccess: Implement unsafe accessors"
  arm64: avoid clang warning about self-assignment
  arm64: Kconfig.platforms: fix warning unmet direct dependencies
  lib/raid6: arm: optimize away a mask operation in NEON recovery routine
  lib/raid6: use vdupq_n_u8 to avoid endianness warnings
  arm64: io: Hook up __io_par() for inX() ordering
  riscv: io: Update __io_[p]ar() macros to take an argument
  asm-generic/io: Pass result of I/O accessor to __io_[p]ar()
  arm64: Add workaround for Fujitsu A64FX erratum 010001
  arm64: Rename get_thread_info()
  arm64: Remove documentation about TIF_USEDFPU
  arm64: irqflags: Fix clang build warnings
  arm64: Enable the support of pseudo-NMIs
  arm64: Skip irqflags tracing for NMI in IRQs disabled context
  arm64: Skip preemption when exiting an NMI
  arm64: Handle serror in NMI context
  irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/arm64/silicon-errata.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
index c5f6a57f16b8001bf09b94fdb5cd459b07986d58,d4faca775d9c43a28ee2bdbd6d24f64c20de8a11..70498a033cf57408ccdefe374c5fa8e1d22e785d
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -151,11 -145,7 +151,11 @@@ config ARCH_MVEB
  config ARCH_MXC
        bool "ARMv8 based NXP i.MX SoC family"
        select ARM64_ERRATUM_843419
-       select ARM64_ERRATUM_845719
+       select ARM64_ERRATUM_845719 if COMPAT
 +      select IMX_GPCV2
 +      select IMX_GPCV2_PM_DOMAINS
 +      select PM
 +      select PM_GENERIC_DOMAINS
        help
          This enables support for the ARMv8 based SoCs in the
          NXP i.MX family.

diff --cc arch/arm64/include/asm/daifflags.h
index fa90779fc752f67bd42f11ec1ca29d08a296ff4d,1dd3d7a38d345cdb717db3307878fa0109027c55..db452aa9e6518ee8b116086bfebb16cacd7d2eff
--- 1/arch/arm64/include/asm/daifflags.h
--- 2/arch/arm64/include/asm/daifflags.h
+++ b/arch/arm64/include/asm/daifflags.h
@@@ -18,9 -18,10 +18,11 @@@
  
  #include <linux/irqflags.h>
  
+ #include <asm/cpufeature.h>
+ 
  #define DAIF_PROCCTX          0
  #define DAIF_PROCCTX_NOIRQ    PSR_I_BIT
 +#define DAIF_ERRCTX           (PSR_I_BIT | PSR_A_BIT)
  
  /* mask/save/unmask/restore all exceptions, including interrupts. */
  static inline void local_daif_mask(void)

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

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

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

diff --cc arch/arm64/kernel/probes/kprobes.c
Simple merge

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

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

diff --cc arch/arm64/kvm/hyp/switch.c
index 421ebf6f708630416a41a975f9b6c2a7d6eff1fe,6a4c2d6c3287fa18723c4d6e18223e43a2729654..3563fe655cd53f366ddc5897606b0db5c9c27f73
--- 1/arch/arm64/kvm/hyp/switch.c
--- 2/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@@ -22,8 -22,8 +22,9 @@@
  
  #include <kvm/arm_psci.h>
  
+ #include <asm/arch_gicv3.h>
  #include <asm/cpufeature.h>
 +#include <asm/kprobes.h>
  #include <asm/kvm_asm.h>
  #include <asm/kvm_emulate.h>
  #include <asm/kvm_host.h>

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

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

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

diff --cc drivers/firmware/efi/arm-runtime.c
Simple merge

diff --cc drivers/firmware/efi/runtime-wrappers.c
Simple merge

diff --cc drivers/perf/xgene_pmu.c
Simple merge

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