diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-12-13 12:44:18 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-12-13 12:44:18 +0300 |
| commit | ec10574d00da0d8b6ec9d0099410aae8aad4695a (patch) | |
| tree | 2d8b2d3a956cf1877f19408f4425640c9af93f28 /MAINTAINERS | |
| parent | a7b1868a5f473fb93d912a618883cef0d43653b9 (diff) | |
| parent | 4868d2b662f55ff2e27e92c44b14016531a022a0 (diff) | |
| download | linux-ec10574d00da0d8b6ec9d0099410aae8aad4695a.tar.xz | |
Merge tag 'vfio-ccw-20181213' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features
Pull vfio-ccw from Cornelia Huck with the following changes:
- remove unneeded BOXED state
- maintainership changes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5d17f568a3b9..2e9d876d65d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13021,7 +13021,9 @@ F: drivers/pci/hotplug/s390_pci_hpc.c S390 VFIO-CCW DRIVER M: Cornelia Huck <cohuck@redhat.com> -M: Halil Pasic <pasic@linux.ibm.com> +M: Farhan Ali <alifm@linux.ibm.com> +M: Eric Farman <farman@linux.ibm.com> +R: Halil Pasic <pasic@linux.ibm.com> L: linux-s390@vger.kernel.org L: kvm@vger.kernel.org S: Supported |