diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-12 07:33:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-12 07:33:37 -0400 |
| commit | 90eac7eee2f4257644dcfb9d22348fded7c24afd (patch) | |
| tree | ea472521485299a830095ea341f263cfb0425f1e /MAINTAINERS | |
| parent | 6bbcb1d3a2e0a31593e3b7d9bfd112fa7f447141 (diff) | |
| parent | 89c5497d1f933af56dac617f0fd86150942a7fb6 (diff) | |
Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull ftrace test code from Steven Rostedt:
"This patch series starts a new selftests section in the
tools/testing/selftest directory called "ftrace" that holds tests
aimed at testing ftrace and subsystems that use ftrace (like kprobes).
So far only a few tests were written (by Masami Hiramatsu), but more
will be added in the near future (3.19)"
* tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Add selftest scripts testing kprobe-tracer as startup test
ftracetest: Add POSIX.3 standard and XFAIL result codes
ftracetest: Add kprobe basic testcases
ftracetest: Add ftrace basic testcases
ftracetest: Initial commit for ftracetest
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d6964389f028..e599d4184e15 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -9432,6 +9432,7 @@ F: include/*/ftrace.h | |||
| 9432 | F: include/linux/trace*.h | 9432 | F: include/linux/trace*.h |
| 9433 | F: include/trace/ | 9433 | F: include/trace/ |
| 9434 | F: kernel/trace/ | 9434 | F: kernel/trace/ |
| 9435 | F: tools/testing/selftests/ftrace/ | ||
| 9435 | 9436 | ||
| 9436 | TRIVIAL PATCHES | 9437 | TRIVIAL PATCHES |
| 9437 | M: Jiri Kosina <trivial@kernel.org> | 9438 | M: Jiri Kosina <trivial@kernel.org> |