Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e4bdea0..b43662a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1496,7 +1496,7 @@ F:        drivers/amba/
 F:     include/linux/amba/bus.h
 
 ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com@bootlin.com>
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
@@ -1504,7 +1504,7 @@ F:        Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
 F:     drivers/mtd/nand/raw/pl35x-nand-controller.c
 
 ARM PRIMECELL PL35X SMC DRIVER
-M:     Miquel Raynal <miquel.raynal@bootlin.com@bootlin.com>
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
 M:     Naga Sureshkumar Relli <nagasure@xilinx.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -18973,6 +18973,20 @@ F:     arch/x86/mm/testmmiotrace.c
 F:     include/linux/mmiotrace.h
 F:     kernel/trace/trace_mmiotrace.c
 
+TRACING OS NOISE / LATENCY TRACERS
+M:     Steven Rostedt <rostedt@goodmis.org>
+M:     Daniel Bristot de Oliveira <bristot@kernel.org>
+S:     Maintained
+F:     kernel/trace/trace_osnoise.c
+F:     include/trace/events/osnoise.h
+F:     kernel/trace/trace_hwlat.c
+F:     kernel/trace/trace_irqsoff.c
+F:     kernel/trace/trace_sched_wakeup.c
+F:     Documentation/trace/osnoise-tracer.rst
+F:     Documentation/trace/timerlat-tracer.rst
+F:     Documentation/trace/hwlat_detector.rst
+F:     arch/*/kernel/trace.c
+
 TRADITIONAL CHINESE DOCUMENTATION
 M:     Hu Haowen <src.res@email.cn>
 L:     linux-doc-tw-discuss@lists.sourceforge.net
@@ -19153,9 +19167,8 @@ W:      http://dotat.at/prog/unifdef
 F:     scripts/unifdef.c
 
 UNIFORM CDROM DRIVER
-M:     Jens Axboe <axboe@kernel.dk>
+M:     Phillip Potter <phil@philpotter.co.uk>
 S:     Maintained
-W:     http://www.kernel.dk
 F:     Documentation/cdrom/
 F:     drivers/cdrom/cdrom.c
 F:     include/linux/cdrom.h