Merge branch 'vfio-ccw-for-martin' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 31 Mar 2017 11:01:46 +0000 (13:01 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 31 Mar 2017 11:01:46 +0000 (13:01 +0200)
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  2 
MAINTAINERS
arch/s390/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge