diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 12:41:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 12:41:28 +0100 |
| commit | 6e98670feb717e0315c6a396cde8417ffa68cac7 (patch) | |
| tree | 170cd201b3512eaf3b03186f2aa84a60996e5e0d /MAINTAINERS | |
| parent | 0f2fa73ba0ca19ebdaccf0d1785583d6601411b6 (diff) | |
| parent | 4d4ccabdd22153bd19e0c4bbb6fbfe8402a7b845 (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160919' into staging
Couple of s390x patches:
- fixup for the cpu model patches
- support for virtio 1.1 READ_STATUS command
- update MAINTAINERS file pattern
# gpg: Signature made Mon 19 Sep 2016 10:11:06 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160919:
QMP: fixup typos and whitespace damage
virtio-ccw: set revision 2 as maximal revision number
virtio-ccw: respond to READ_STATUS command
MAINTAINERS: update s390 machine file patterns
s390x/kvm: disable cpu model for the 2.7 machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e1d458933f..3e106c823d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -669,6 +669,9 @@ F: hw/s390x/ F: include/hw/s390x/ F: pc-bios/s390-ccw/ F: hw/watchdog/wdt_diag288.c +F: include/hw/watchdog/wdt_diag288.h +F: pc-bios/s390-ccw.img +F: default-configs/s390x-softmmu.mak T: git git://github.com/cohuck/qemu.git s390-next T: git git://github.com/borntraeger/qemu.git s390-next |