diff options
| author | Peter Maydell | 2019-07-26 11:53:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-26 11:53:20 +0200 |
| commit | 9246fade39e1191560fcf2f955f044f63a44c7db (patch) | |
| tree | 6c8e0226999e2438972692e7c919c6c2f7452988 /hw/scsi/virtio-scsi.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | tpm_emulator: Translate TPM error codes to strings (diff) | |
| download | qemu-9246fade39e1191560fcf2f955f044f63a44c7db.tar.gz qemu-9246fade39e1191560fcf2f955f044f63a44c7db.tar.xz qemu-9246fade39e1191560fcf2f955f044f63a44c7db.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-07-25-1' into staging
Merge tpm 2019/07/25 v1
# gpg: Signature made Thu 25 Jul 2019 16:40:54 BST
# gpg: using RSA key 75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2019-07-25-1:
tpm_emulator: Translate TPM error codes to strings
tpm: Exit in reset when backend indicates failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/virtio-scsi.c')
0 files changed, 0 insertions, 0 deletions