]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-02-25-1' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 4 Mar 2019 15:56:07 +0000 (15:56 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 4 Mar 2019 15:56:08 +0000 (15:56 +0000)
commit88687719c8859bf98ed94ce91612608c99c51c1a
treee193cc9693d2b7a1a683c59769285d3f72103d7e
parent1ba530a4ecba6015d52d8f392fd327cfa07bc37a
parentcd38cc519b60bbe5dd8d85f6aaa72b2d7902930b
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-02-25-1' into staging

Merge tpm 2029/02/25 v1

# gpg: Signature made Mon 25 Feb 2019 15:05:12 GMT
# 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-02-25-1:
  tpm_tis: convert tpm_tis_show_buffer() to use trace event
  tpm_tis: fix loop that cancels any seizure by a lower locality

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