Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 12 Feb 2021 14:08:41 +0000 (14:08 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 12 Feb 2021 14:08:41 +0000 (14:08 +0000)
commitc93199e93e1232b7220482dffa05b7a32a195fe8
tree8af55cb63c2c44c37455f0d79c06c5d92767f775
parent8cb68a9d147da4630603937e42e52c0b4ea1602e
parent8c358b29e0dc69d5ced6acfea4cc3d1dcf10df27
Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' into kvmarm-master/next

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