Merge remote-tracking branch 'arm64/for-next/ghostbusters' into kvm-arm64/hyp-pcpu
authorMarc Zyngier <maz@kernel.org>
Wed, 30 Sep 2020 08:48:30 +0000 (09:48 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 30 Sep 2020 08:48:30 +0000 (09:48 +0100)
commit816c347f3a48fb15370b23664760ea61286fea05
tree7eb7f4f7e1e944eaa1f5ac34fd68fa3570cc8ccf
parenta3bb9c3a00551726590137e3974495ce6cf6b758
parent780c083a8f840ca9162c7a4090ff5e10d15152a2
Merge remote-tracking branch 'arm64/for-next/ghostbusters' into kvm-arm64/hyp-pcpu

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/kernel/image-vars.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/include/hyp/switch.h
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/hyp/vhe/switch.c