summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Maydell2018-05-14 12:08:16 +0200
committerPeter Maydell2018-05-14 12:08:16 +0200
commitbbd87423ea0c436c55bbc3f9c23d4f811d1f3f29 (patch)
tree1b7c76de876d91fb7c114cc5b937d3bb749de2cd
parentMerge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff)
parentMAINTAINERS: Add trace-events and qemu-option-trace.texi to tracing section (diff)
downloadqemu-bbd87423ea0c436c55bbc3f9c23d4f811d1f3f29.tar.gz
qemu-bbd87423ea0c436c55bbc3f9c23d4f811d1f3f29.tar.xz
qemu-bbd87423ea0c436c55bbc3f9c23d4f811d1f3f29.zip
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
tracing patches Just a MAINTAINERS file update for tracing files. # gpg: Signature made Fri 11 May 2018 19:28:34 BST # gpg: using RSA key 9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: MAINTAINERS: Add trace-events and qemu-option-trace.texi to tracing section Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 459e3594e1..e187b1f18f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1656,6 +1656,8 @@ Tracing
M: Stefan Hajnoczi <stefanha@redhat.com>
S: Maintained
F: trace/
+F: trace-events
+F: qemu-option-trace.texi
F: scripts/tracetool.py
F: scripts/tracetool/
F: docs/devel/tracing.txt