summary refs log tree commit diff
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2018-01-31 13:34:19 +0100
committerRadim Krčmář <rkrcmar@redhat.com>2018-01-31 13:34:19 +0100
commit810f4600ec5ee79c68dcbb136ed26a652df46348 (patch)
treef31a1f3792f4de04cd89df4d011040252f637b3e
parent92ea2b3381d7dc4223375f4337dcadb1fd556576 (diff)
parentcd74ff94524e138e72e9feb5bf5b30ce28ba2311 (diff)
downloadlinux-810f4600ec5ee79c68dcbb136ed26a652df46348.tar.gz
Merge tag 'kvm-s390-next-4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: update maintainers
-rw-r--r--MAINTAINERS5
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 82ad0eabce4f..71781ad422f0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7692,7 +7692,9 @@ F:	arch/powerpc/kernel/kvm*
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
 M:	Christian Borntraeger <borntraeger@de.ibm.com>
-M:	Cornelia Huck <cohuck@redhat.com>
+M:	Janosch Frank <frankja@linux.vnet.ibm.com>
+R:	David Hildenbrand <david@redhat.com>
+R:	Cornelia Huck <cohuck@redhat.com>
 L:	linux-s390@vger.kernel.org
 W:	http://www.ibm.com/developerworks/linux/linux390/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
@@ -11862,6 +11864,7 @@ F:	drivers/pci/hotplug/s390_pci_hpc.c
 S390 VFIO-CCW DRIVER
 M:	Cornelia Huck <cohuck@redhat.com>
 M:	Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+M:	Halil Pasic <pasic@linux.vnet.ibm.com>
 L:	linux-s390@vger.kernel.org
 L:	kvm@vger.kernel.org
 S:	Supported