From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 15 Jun 2017 12:45:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/rth/tags/pull-s390-20170613' into staging
X-Git-Url: https://repo.jachan.dev/qemu.git/commitdiff_plain/edf8bc98424d62035d5e4c0f39542722d72d7979?hp=-c

Merge remote-tracking branch 'remotes/rth/tags/pull-s390-20170613' into staging

Queued s390 patches

# gpg: Signature made Tue 13 Jun 2017 21:22:41 BST
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-s390-20170613:
  s390x/cpumodel: wire up cpu type + id for TCG
  target/s390x: rework PGM interrupt psw.addr handling
  target/s390x: correctly indicate PER nullification

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

edf8bc98424d62035d5e4c0f39542722d72d7979