From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 25 Jun 2020 13:31:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
X-Git-Tag: qemu-xen-4.15.0~118
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=beafab86a3062489cffd58d6608e64df98e256f1;p=qemu-xen.git

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>
---

beafab86a3062489cffd58d6608e64df98e256f1