Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:38:03 +0000 (15:38 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:38:03 +0000 (15:38 +0100)
commit5c92a7643b14a5bc93bac6e2af5f9010e284b584
tree240d2caf739f1e2e42f23f12bd7fa8b38d920795
parentad569b70aa02ffba1e86411b79570cbe4e6c7bb8
parentaec0fae62e47050019474936248a311a0ab08705
Merge branch 'kvm-arm64/nvhe-panic-info' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_hyp.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kernel/image-vars.h
arch/arm64/kvm/hyp/include/hyp/switch.h
arch/arm64/kvm/hyp/include/nvhe/gfp.h
arch/arm64/kvm/hyp/include/nvhe/memory.h
arch/arm64/kvm/hyp/nvhe/hyp-main.c
arch/arm64/kvm/hyp/nvhe/mem_protect.c