Merge branch 'kvm-arm64/misc-5.11' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 27 Nov 2020 19:48:24 +0000 (19:48 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 27 Nov 2020 19:48:24 +0000 (19:48 +0000)
commit90f0e16c649ac3e93094cb491072d6424f53be43
tree42d6887207065642b46baad0132fe363c8255afa
parentbb528f4f57d096793c133f44e1ac70db602d8c28
parentbf118a5cb7e6d17e7ec9492e4dc676e7e7b69d01
Merge branch 'kvm-arm64/misc-5.11' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/reset.c