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)
commite32afede682ee6c3ad2f1990967dc90dac51b9f6
tree0485b9f0c94a1d3d1ad5815e03e4916cd610afae
parent2cc14f52aeb78ce3f29677c2de1f06c0e91471ab
parent4ebee8cebdf6d661dfe7272cf74d378108160a3e
Merge remote-tracking branch 'arm64/for-next/sysregs' into kvm-arm64/fgt-rework

Add shared arm64/for-next/sysregs branch to deal with conflict resolution.

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