From: Marc Zyngier Date: Wed, 4 May 2022 08:38:32 +0000 (+0100) Subject: Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next X-Git-Tag: howlett/maple/20220722_2~444^2~12^2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b88524c47d7bffd5aaabf918c7759c74a1c577b;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next Merge arm64's SME branch to resolve conflicts with the WFxT branch. Signed-off-by: Marc Zyngier --- 4b88524c47d7bffd5aaabf918c7759c74a1c577b