projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 15f9017 e26bb75)
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)
commita049cf7e63e75f920434140ccf54fda3ce4ec4fb
tree32869d34d173cbaabaf0f02797857af174fa7a8btree | snapshot
parent15f9017c28a8c2aeecdad9adb577c475b1f7817ecommit | diff
parente26bb75aa2f17fc079e6a24dff653b098e1f5d37commit | 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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git