]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f98bbf5 232337f)
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)
commit409cf332d3588a60c1089d8e8664468d471640ff
tree32869d34d173cbaabaf0f02797857af174fa7a8btree | snapshot
parentf98bbf510dfbfd95d49c799fa8297f6758fe8443commit | diff
parent232337f5dbdaf557c36aef14ed5808bff750cc37commit | diff
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 diff1 | diff2 | blob | history
Linux Kernel Source Tree.