[qemu-xen master] Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

[patchbot@xxxxxxx]

commit b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf
Merge: aecdfcc3f8499b34a90e5b21159b4d245bc833c2 
27e08bab94f7c6ebe0b75938c98c394c969e3fd8
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Fri Jul 10 09:01:28 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Fri Jul 10 09:01:28 2020 +0100

    Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' 
into staging
    
    Pull request
    
    Fix for a LTTng Userspace Tracer header problem.
    
    # gpg: Signature made Tue 07 Jul 2020 16:10:04 BST
    # gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@xxxxxxxxxx>" [full]
    # gpg:                 aka "Stefan Hajnoczi <stefanha@xxxxxxxxx>" [full]
    # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 
73C8
    
    * remotes/stefanha/tags/tracing-pull-request:
      tracetool: work around ust <sys/sdt.h> include conflict
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 scripts/tracetool/backend/dtrace.py | 6 ++++++
 1 file changed, 6 insertions(+)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master