diff options
| author | Peter Maydell | 2020-07-31 11:28:12 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-31 11:28:13 +0200 |
| commit | d74824cf7c8b352f9045e949dc636c7207a41eee (patch) | |
| tree | fa9912258f9d9901f840ca4a3be8ddbced68d844 /tests/qapi-schema/include/sub-module.json | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int... (diff) | |
| parent | s390x/s390-virtio-ccw: fix off-by-one in loadparm getter (diff) | |
| download | qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.tar.gz qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.tar.xz qemu-d74824cf7c8b352f9045e949dc636c7207a41eee.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200731' into staging
Fix a problem introduced in a recent fix.
# gpg: Signature made Fri 31 Jul 2020 09:50:28 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20200731:
s390x/s390-virtio-ccw: fix off-by-one in loadparm getter
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qapi-schema/include/sub-module.json')
0 files changed, 0 insertions, 0 deletions