Merge remote-tracking branch 'arm64/for-next/sysregs' into kvm-arm64/fgt-rework
authorMarc Zyngier <maz@kernel.org>
Mon, 18 Dec 2023 09:19:35 +0000 (09:19 +0000)
committerMarc Zyngier <maz@kernel.org>
Mon, 18 Dec 2023 09:19:35 +0000 (09:19 +0000)
Add shared arm64/for-next/sysregs branch to deal with conflict resolution.

Signed-off-by: Marc Zyngier <maz@kernel.org>

Trivial merge