Merge branch arm64/for-next/sme2 into kvmarm/next

Merge the SME2 branch to fix up a rather annoying conflict due to the
EL2 finalization refactor.

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

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

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

diff --cc arch/arm64/kernel/ptrace.c
index 0c321ad23cd3a48d60a52f3a0a1209c4b7218ac2,38be7ca202afe190dacd543f3e50574a8a589b3b..89b87f1021edbe6d82669e7c3da74c2ffe50cf8d
--- 1/arch/arm64/kernel/ptrace.c
--- 2/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@@ -1357,9 -1402,10 +1402,10 @@@ enum aarch64_regset 
  #ifdef CONFIG_ARM64_SVE
        REGSET_SVE,
  #endif
 -#ifdef CONFIG_ARM64_SVE
 +#ifdef CONFIG_ARM64_SME
        REGSET_SSVE,
        REGSET_ZA,
+       REGSET_ZT,
  #endif
  #ifdef CONFIG_ARM64_PTR_AUTH
        REGSET_PAC_MASK,

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

diff --cc arch/arm64/tools/cpucaps
Simple merge