From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 22 Sep 2017 09:55:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170922' into staging
X-Git-Tag: v2.11.0-rc0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aaa8d4499de2a8d07ccc2c8e6e362479e1d433f;p=thirdparty%2Fqemu.git

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

Fix an s390x migration breakage up for 2.10 stable.
This will be fixed properly for 2.11.

# gpg: Signature made Fri 22 Sep 2017 08:28:22 BST
# 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-20170922:
  s390x/ais: for 2.10 stable: disable ais facility

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

3aaa8d4499de2a8d07ccc2c8e6e362479e1d433f