]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 9 Dec 2020 10:00:24 +0000 (10:00 +0000)
committerMarc Zyngier <maz@kernel.org>
Wed, 9 Dec 2020 10:00:24 +0000 (10:00 +0000)
commitc66a60d788c88c0f3a104222a27cd8be8328f66f
tree1209f5cb0a780f87c41e3299b22776a221766892
parent2bdc521093c8879e0056986dbdfcc63d4a9a8a2a
parentb2c439d826cbf3fde5150dc0f197f7eea6c7291b
Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
13 files changed:
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/process.c
arch/arm64/kernel/proton-pack.c
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/Makefile
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/va_layout.c