From: Oliver Upton <oliver.upton@linux.dev>
Date: Mon, 13 Feb 2023 22:30:07 +0000 (+0000)
Subject: Merge branch arm64/for-next/sme2 into kvmarm/next
X-Git-Tag: v6.6.17~5432^2~2^2^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=619cec00857f21dbc6db5ef9e0b9c613479f3745;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

619cec00857f21dbc6db5ef9e0b9c613479f3745
diff --cc arch/arm64/kernel/ptrace.c
index 0c321ad,38be7ca..89b87f1
--- a/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,