diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-27 17:25:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-27 17:25:06 +0100 |
| commit | 9303ecb658a0194560d1eecde165a1511223c2d8 (patch) | |
| tree | cb77c122304a49e2250bf4073bc51a22d139be6e /blockdev-nbd.c | |
| parent | cb320a07e6cb6e251f9aeb4bf57f99cc320eb8ea (diff) | |
| parent | d6645483285feaa0aa26fe2b0c3bac6989250d2f (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200727' into staging
fixes for protected virtualization and loadparm handling
# gpg: Signature made Mon 27 Jul 2020 15:01:32 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-20200727:
s390x/s390-virtio-ccw: fix loadparm property getter
s390x/protvirt: allow to IPL secure guests with -no-reboot
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev-nbd.c')
0 files changed, 0 insertions, 0 deletions