From: Peter Maydell Date: Tue, 1 Dec 2015 16:30:27 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151201' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3d58827fe4efa8d40a78359350a185e238514e0;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151201' into staging Last round of s390x fixes for 2.5: - The bios should be built for the first z machine, so that newer instructions don't creep in. - Silence annoying message when running make check. - Fix a problem with the pci iommu exposed by recent changes. # gpg: Signature made Tue 01 Dec 2015 08:59:42 GMT using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20151201: s390x/pci: fix up IOMMU size s390x: no deprecation warning while testing pc-bios/s390-ccw: rebuild image pc-bios/s390-ccw: build for z900 Signed-off-by: Peter Maydell --- e3d58827fe4efa8d40a78359350a185e238514e0