diff options
author | Peter Maydell | 2020-07-10 10:01:28 +0200 |
---|---|---|
committer | Peter Maydell | 2020-07-10 10:01:28 +0200 |
commit | b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf (patch) | |
tree | 70592dbbbf4a4a99b4823431150b7079cf3748d6 /fsdev | |
parent | Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200704' int... (diff) | |
parent | tracetool: work around ust <sys/sdt.h> include conflict (diff) | |
download | qemu-b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf.tar.gz qemu-b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf.tar.xz qemu-b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf.zip |
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@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:
tracetool: work around ust <sys/sdt.h> include conflict
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev')
0 files changed, 0 insertions, 0 deletions