Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commitbeafab86a3062489cffd58d6608e64df98e256f1
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 25 Jun 2020 13:31:35 +0000 (25 14:31 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 25 Jun 2020 13:31:35 +0000 (25 14:31 +0100)
treec33fed79be046c7ff6a48d33db83ef3d78591d14
parent0250c595c9dd61221515221e92737422c75dd38b
parentdb25d56c014aa1a96319c663e0a60346a223b31e
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

Pull request

# gpg: Signature made Wed 24 Jun 2020 11:25:27 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace/simple: Fix unauthorized enable
  scripts/tracetool: Update maintainer email address

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