From: Peter Maydell Date: Tue, 1 Mar 2016 13:09:55 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160301' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c279bec754a84c790b70674a5a224379c8dcda2;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160301' into staging Assorted fixes, cleanups and enhancements. # gpg: Signature made Tue 01 Mar 2016 11:45:12 GMT using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20160301: s390x/css: only suspend when enabled by orb MAINTAINERS: Remove entry for hw/s390x/s390-virtio-bus.[ch] MAINTAINERS: Remove the old s390-virtio machine s390x/pci: use PCI_MSIX_FLAGS on retrieving the MSIX entries s390x/css: Use static initialization for channel_subsys fields s390x/css: Allocate channel_subsys statically s390x/pci: fix reg/dereg irq functions s390x/css: introduce indicator refcounting interfaces s390x/virtio: old machine leftovers watchdog/diag288: avoid race condition on expired watchdog s390x: remove {kvm_}s390_virtio_irq() s390x: fix debug statement in trigger_page_fault() s390x/kvm: sync fprs via kvm_run linux-headers: update against kvm/next Signed-off-by: Peter Maydell --- 9c279bec754a84c790b70674a5a224379c8dcda2