From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 02:58:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: KARO-TXUL-2015-12-04~63
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=86e74d14e6458701df4c688dec7432d9a37ae886

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

86e74d14e6458701df4c688dec7432d9a37ae886
diff --cc drivers/vfio/Kconfig
index b6d3cdc2791b,850d86ca685b..da6e2ce77495
--- a/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"