Merge branch 'vfio-ccw-for-martin' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features

Pull vfio-ccw branch to add the basic channel I/O passthrough
intrastructure based on vfio.

The focus is on supporting dasd-eckd(cu_type/dev_type = 0x3990/0x3390)
as the target device.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 24136346fe58..2ad7588e8a13 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10860,6 +10860,16 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/iommu/s390-iommu.c
 
+S390 VFIO-CCW DRIVER
+M:      Cornelia Huck <cornelia.huck@de.ibm.com>
+M:      Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+L:      linux-s390@vger.kernel.org
+L:      kvm@vger.kernel.org
+S:      Supported
+F:      drivers/s390/cio/vfio_ccw*
+F:      Documentation/s390/vfio-ccw.txt
+F:      include/uapi/linux/vfio_ccw.h
+
 S3C24XX SD/MMC Driver
 M:      Ben Dooks <ben-linux@fluff.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)