diff options
author | Marc Zyngier <maz@kernel.org> | 2021-08-20 11:49:23 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2021-08-20 11:49:23 +0100 |
commit | 6e73bc90ec447b8fcec5fd22fa49e100f3b4f909 (patch) | |
tree | 792b10d96185da47d410539790dd5de234183d98 /arch/arm64/kvm/handle_exit.c | |
parent | KVM: arm64: vgic: Resample HW pending state on deactivation (diff) | |
parent | arm64/kexec: Test page size support with new TGRAN range values (diff) | |
download | linux-dev-6e73bc90ec447b8fcec5fd22fa49e100f3b4f909.tar.xz linux-dev-6e73bc90ec447b8fcec5fd22fa49e100f3b4f909.zip |
Merge branch arm64/for-next/sysreg into kvm-arm64/misc-5.15
Merge the arm64/for-next/sysreg branch to avoid merge conflicts
in -next and upstream.
* arm64/for-next/sysreg:
arm64/kexec: Test page size support with new TGRAN range values
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/handle_exit.c')
0 files changed, 0 insertions, 0 deletions