From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 24 Nov 2017 10:26:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171124' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=38e83b6bed80ebabcbab22f9d5b5215071e32b52;p=qemu.git

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171124' into staging

Deal with the fallout from the deletion of the old s390 virtio header
in Linux master.

# gpg: Signature made Fri 24 Nov 2017 09:56:49 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20171124:
  s390/kvm_virtio/linux-headers: remove traces of old virtio transport

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

38e83b6bed80ebabcbab22f9d5b5215071e32b52