From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 6 May 2020 20:13:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-06-1' into... 
X-Git-Tag: v5.1.0-rc0~138
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=298d893dd5006a38d0475fb584ae71b9e9f6e161;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-06-1' into staging

Merge tpm 2020/05/06 v1

# gpg: Signature made Wed 06 May 2020 15:16:17 BST
# gpg:                using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# 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-2020-05-06-1:
  hw: add compat machines for 5.1
  hw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off
  tpm: tpm-tis-device: set PPI to false by default

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

298d893dd5006a38d0475fb584ae71b9e9f6e161