From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 29 Nov 2019 11:41:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-11-29' into... 
X-Git-Tag: qemu-xen-4.14.0~249
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b944295090e9cad3d159dde480ca85756d3c574b;p=qemu-xen.git

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-11-29' into staging

A fix for regression in the s390-ccw bios

# gpg: Signature made Fri 29 Nov 2019 09:26:51 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-11-29:
  pc-bios/s390: Update firmware image with the "fix sclp_get_loadparm_ascii" patch
  pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

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

b944295090e9cad3d159dde480ca85756d3c574b