From: Marc Zyngier <maz@kernel.org>
Date: Mon, 11 Oct 2021 09:14:38 +0000 (+0100)
Subject: Merge branch kvm-arm64/misc-5.16 into kvmarm-master/next
X-Git-Tag: v5.16-rc1~153^2~4^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a049cf7e63e75f920434140ccf54fda3ce4ec4fb;p=thirdparty%2Fkernel%2Flinux.git

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>
---

a049cf7e63e75f920434140ccf54fda3ce4ec4fb