summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 19:17:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 19:17:27 -0700
commita40a1d3d0a2fd613fdec6d89d3c053268ced76ed (patch)
treeed8ea274f82e0cb645632c9b1ddcd1a6afc40bad /MAINTAINERS
parent3e9a97082fa639394e905e1fc4a0a7f719ca7644 (diff)
parent89e1f7d4c66d85f42c3d52ea3866eb10cadf6153 (diff)
downloadlinux-3.10-a40a1d3d0a2fd613fdec6d89d3c053268ced76ed.tar.gz
linux-3.10-a40a1d3d0a2fd613fdec6d89d3c053268ced76ed.tar.bz2
linux-3.10-a40a1d3d0a2fd613fdec6d89d3c053268ced76ed.zip
Merge tag 'vfio-for-v3.6' of git://github.com/awilliam/linux-vfio
Pull VFIO core from Alex Williamson: "This series includes the VFIO userspace driver interface for the 3.6 kernel merge window. This driver is intended to provide a secure interface for device access using IOMMU protection for applications like assignment of physical devices to virtual machines. Qemu will be the first user of this interface, enabling assignment of PCI devices to Qemu guests. This interface is intended to eventually replace the x86-specific assignment mechanism currently available in KVM. This interface has the advantage of being more secure, by working with IOMMU groups to ensure device isolation and providing it's own filtered resource access mechanism, and also more flexible, in not being x86 or KVM specific (extensions to enable POWER are already working). This driver is originally the work of Tom Lyon, but has since been handed over to me and gone through a complete overhaul thanks to the input from David Gibson, Ben Herrenschmidt, Chris Wright, Joerg Roedel, and others. This driver has been available in linux-next for the last month." Paul Mackerras says: "I would be glad to see it go in since we want to use it with KVM on PowerPC. If possible we'd like the PowerPC bits for it to go in as well." * tag 'vfio-for-v3.6' of git://github.com/awilliam/linux-vfio: vfio: Add PCI device driver vfio: Type1 IOMMU implementation vfio: Add documentation vfio: VFIO core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 36ed8a14e8e..6720018bc67 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7414,6 +7414,14 @@ S: Maintained
F: Documentation/filesystems/vfat.txt
F: fs/fat/
+VFIO DRIVER
+M: Alex Williamson <alex.williamson@redhat.com>
+L: kvm@vger.kernel.org
+S: Maintained
+F: Documentation/vfio.txt
+F: drivers/vfio/
+F: include/linux/vfio.h
+
VIDEOBUF2 FRAMEWORK
M: Pawel Osciak <pawel@osciak.com>
M: Marek Szyprowski <m.szyprowski@samsung.com>