Merge tag 'trace-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0dc4a76..bf93366 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8433,6 +8433,19 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/fujitsu-tablet.c
 
+FUNCTION HOOKS (FTRACE)
+M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
+R:     Mark Rutland <mark.rutland@arm.com>
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
+F:     Documentation/trace/ftrace*
+F:     kernel/trace/ftrace*
+F:     kernel/trace/fgraph.c
+F:     arch/*/*/*/*ftrace*
+F:     arch/*/*/*ftrace*
+F:     include/*/ftrace.h
+
 FUNGIBLE ETHERNET DRIVERS
 M:     Dimitris Michailidis <dmichail@fungible.com>
 L:     netdev@vger.kernel.org
@@ -11422,7 +11435,7 @@ M:      Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
 F:     Documentation/trace/kprobes.rst
 F:     include/asm-generic/kprobes.h
 F:     include/linux/kprobes.h
@@ -20771,14 +20784,11 @@ F:    drivers/hwmon/pmbus/tps546d24.c
 
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Ingo Molnar <mingo@redhat.com>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
-F:     Documentation/trace/ftrace.rst
-F:     arch/*/*/*/*ftrace*
-F:     arch/*/*/*ftrace*
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
+F:     Documentation/trace/*
 F:     fs/tracefs/
-F:     include/*/ftrace.h
 F:     include/linux/trace*.h
 F:     include/trace/
 F:     kernel/trace/
@@ -20787,7 +20797,7 @@ F:      tools/testing/selftests/ftrace/
 
 TRACING MMIO ACCESSES (MMIOTRACE)
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Ingo Molnar <mingo@kernel.org>
+M:     Masami Hiramatsu <mhiramat@kernel.org>
 R:     Karol Herbst <karolherbst@gmail.com>
 R:     Pekka Paalanen <ppaalanen@gmail.com>
 L:     linux-kernel@vger.kernel.org