From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 20 Dec 2018 20:39:04 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181220' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=41e2c56ed95db328a4e24c5756312c0158de71ce;p=qemu.git

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

Two s390x bugfixes.

# gpg: Signature made Thu 20 Dec 2018 16:36:42 GMT
# gpg:                using RSA key DECF6B93C6F02FAF
# 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-20181220:
  hw/s390x: Fix bad mask in time2tod()
  hw/s390/ccw.c: Don't take address of packed members

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

41e2c56ed95db328a4e24c5756312c0158de71ce