]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch kvm-arm64/misc-5.16 into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Mon, 11 Oct 2021 09:14:38 +0000 (10:14 +0100)
committerMarc Zyngier <maz@kernel.org>
Mon, 11 Oct 2021 09:14:38 +0000 (10:14 +0100)
commit0a85e28b9324e1262ee1e9a87c4993237c390f24
tree32869d34d173cbaabaf0f02797857af174fa7a8b
parent72afcff7641687f70dee63255f18760c8430670d
parentb43a92b91db97d09f85206a81261b7af15daf381
Merge branch kvm-arm64/misc-5.16 into kvmarm-master/next

* kvm-arm64/misc-5.16:
  : .
  : - Allow KVM to be disabled from the command-line
  : - Clean up CONFIG_KVM vs CONFIG_HAVE_KVM
  : .
  KVM: arm64: Depend on HAVE_KVM instead of OF
  KVM: arm64: Unconditionally include generic KVM's Kconfig
  KVM: arm64: Allow KVM to be disabled from the command line

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/arm.c