diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-31 07:34:19 -0500 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-31 07:34:19 -0500 |
commit | 810f4600ec5ee79c68dcbb136ed26a652df46348 (patch) | |
tree | f31a1f3792f4de04cd89df4d011040252f637b3e | |
parent | 92ea2b3381d7dc4223375f4337dcadb1fd556576 (diff) | |
parent | cd74ff94524e138e72e9feb5bf5b30ce28ba2311 (diff) |
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-- | MAINTAINERS | 5 |
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* | |||
7692 | 7692 | ||
7693 | KERNEL VIRTUAL MACHINE for s390 (KVM/s390) | 7693 | KERNEL VIRTUAL MACHINE for s390 (KVM/s390) |
7694 | M: Christian Borntraeger <borntraeger@de.ibm.com> | 7694 | M: Christian Borntraeger <borntraeger@de.ibm.com> |
7695 | M: Cornelia Huck <cohuck@redhat.com> | 7695 | M: Janosch Frank <frankja@linux.vnet.ibm.com> |
7696 | R: David Hildenbrand <david@redhat.com> | ||
7697 | R: Cornelia Huck <cohuck@redhat.com> | ||
7696 | L: linux-s390@vger.kernel.org | 7698 | L: linux-s390@vger.kernel.org |
7697 | W: http://www.ibm.com/developerworks/linux/linux390/ | 7699 | W: http://www.ibm.com/developerworks/linux/linux390/ |
7698 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git | 7700 | 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 | |||
11862 | S390 VFIO-CCW DRIVER | 11864 | S390 VFIO-CCW DRIVER |
11863 | M: Cornelia Huck <cohuck@redhat.com> | 11865 | M: Cornelia Huck <cohuck@redhat.com> |
11864 | M: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> | 11866 | M: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> |
11867 | M: Halil Pasic <pasic@linux.vnet.ibm.com> | ||
11865 | L: linux-s390@vger.kernel.org | 11868 | L: linux-s390@vger.kernel.org |
11866 | L: kvm@vger.kernel.org | 11869 | L: kvm@vger.kernel.org |
11867 | S: Supported | 11870 | S: Supported |