summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Borntraeger2018-10-29 16:42:25 +0100
committerCornelia Huck2018-11-05 09:55:29 +0100
commit8e4eb4279fce9a736131b94b6f5f09f0503e4ab3 (patch)
tree959106ee885af33f5571a1e5b6f49b376c0cd539
parentMAINTAINERS: s390: Remove myself (diff)
downloadqemu-8e4eb4279fce9a736131b94b6f5f09f0503e4ab3.tar.gz
qemu-8e4eb4279fce9a736131b94b6f5f09f0503e4ab3.tar.xz
qemu-8e4eb4279fce9a736131b94b6f5f09f0503e4ab3.zip
MAINTAINERS: s390/boot: the ipl code and the bios belong together
The s390-ccw bios and the ipl code do work in lock-step. Let us merge them in the maintainer file. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <1540827745-20795-5-git-send-email-borntraeger@de.ibm.com> Acked-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e0e8b5fb9e..8ec2281a7e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -944,10 +944,11 @@ T: git git://github.com/cohuck/qemu.git s390-next
T: git git://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org
-S390-ccw Bios
+S390-ccw boot
M: Christian Borntraeger <borntraeger@de.ibm.com>
M: Thomas Huth <thuth@redhat.com>
S: Supported
+F: hw/s390x/ipl.*
F: pc-bios/s390-ccw/
F: pc-bios/s390-ccw.img
T: git git://github.com/borntraeger/qemu.git s390-next