From: Peter Maydell Date: Mon, 19 Sep 2016 11:41:28 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160919' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6e98670feb717e0315c6a396cde8417ffa68cac7;p=qemu.git 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 " # gpg: aka "Cornelia Huck " # 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 --- 6e98670feb717e0315c6a396cde8417ffa68cac7