Merge remote-tracking branch 'kvm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:58:56 +0000 (13:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:58:56 +0000 (13:58 +1100)
16 files changed:
1  2 
Documentation/kernel-parameters.txt
Documentation/virtual/kvm/api.txt
MAINTAINERS
Makefile
arch/arm64/kvm/Kconfig
arch/powerpc/include/asm/kvm_host.h
arch/powerpc/kvm/book3s_64_mmu_hv.c
arch/powerpc/kvm/book3s_hv_rm_mmu.c
arch/powerpc/kvm/e500_mmu_host.c
arch/s390/include/asm/kvm_host.h
arch/s390/kvm/kvm-s390.c
arch/x86/kvm/cpuid.c
arch/x86/kvm/x86.c
drivers/vfio/Kconfig
include/kvm/arm_vgic.h
virt/kvm/arm/vgic.c

Simple merge
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge