Merge remote-tracking branch 'kvm/linux-next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kvm/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/kvm_host.h
Simple merge

diff --cc arch/powerpc/kvm/book3s_64_mmu_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rm_mmu.c
Simple merge

diff --cc arch/powerpc/kvm/e500_mmu_host.c
Simple merge

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/kvm/cpuid.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/vfio/Kconfig
index b6d3cdc2791b38de76c3c5e3644128700b3eb7aa,850d86ca685b273344271eda7c95ad4f82b28244..da6e2ce77495b21ec127209664567b7e2f8f467e
--- 1/drivers/vfio/Kconfig
--- 2/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@@ -31,20 -31,6 +31,21 @@@ menuconfig VFI
  
          If you don't know what to do here, say N.
  
 +menuconfig VFIO_NOIOMMU
 +      bool "VFIO No-IOMMU support"
 +      depends on VFIO
 +      help
 +        VFIO is built on the ability to isolate devices using the IOMMU.
 +        Only with an IOMMU can userspace access to DMA capable devices be
 +        considered secure.  VFIO No-IOMMU mode enables IOMMU groups for
 +        devices without IOMMU backing for the purpose of re-using the VFIO
 +        infrastructure in a non-secure mode.  Use of this mode will result
 +        in an unsupportable kernel and will therefore taint the kernel.
 +        Device assignment to virtual machines is also not possible with
 +        this mode since there is no IOMMU to provide DMA translation.
 +
 +        If you don't know what to do here, say N.
 +
  source "drivers/vfio/pci/Kconfig"
  source "drivers/vfio/platform/Kconfig"
+ source "virt/lib/Kconfig"

diff --cc include/kvm/arm_vgic.h
Simple merge

diff --cc virt/kvm/arm/vgic.c
Simple merge