OSDN Git Service

Merge remote-tracking branch 'arm64/for-next/sysregs' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Mon, 5 Dec 2022 14:34:32 +0000 (14:34 +0000)
committerMarc Zyngier <maz@kernel.org>
Mon, 5 Dec 2022 14:39:53 +0000 (14:39 +0000)
commit753d734f3f347e7fc49b819472bbf61dcfc1a16f
treeee53840aa9d51863b24fb1a34d7ea0845e7cab38
parent86f27d849b4713eb9ccf679b084e7d4453cbc73d
parentacb3f4bc2108dca531f81233383e21f0bdc02267
Merge remote-tracking branch 'arm64/for-next/sysregs' into kvmarm-master/next

Merge arm64's sysreg repainting branch to avoid too many
ugly conflicts...

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kernel/cpufeature.c
arch/arm64/kvm/sys_regs.c