Merge tag 'pci-v5.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index dbc0ba7..154c870 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3199,6 +3199,7 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 F:     block/
 F:     drivers/block/
+F:     fs/block_dev.c
 F:     include/linux/blk*
 F:     kernel/trace/blktrace.c
 F:     lib/sbitmap.c
@@ -4354,8 +4355,8 @@ T:        git git://linuxtv.org/media_tree.git
 F:     drivers/media/pci/cobalt/
 
 COCCINELLE/Semantic Patches (SmPL)
-M:     Julia Lawall <Julia.Lawall@lip6.fr>
-M:     Gilles Muller <Gilles.Muller@lip6.fr>
+M:     Julia Lawall <Julia.Lawall@inria.fr>
+M:     Gilles Muller <Gilles.Muller@inria.fr>
 M:     Nicolas Palix <nicolas.palix@imag.fr>
 M:     Michal Marek <michal.lkml@markovi.net>
 L:     cocci@systeme.lip6.fr (moderated for non-subscribers)
@@ -5297,6 +5298,12 @@ F:       include/linux/dma-mapping.h
 F:     include/linux/dma-map-ops.h
 F:     kernel/dma/
 
+DMA MAPPING BENCHMARK
+M:     Barry Song <song.bao.hua@hisilicon.com>
+L:     iommu@lists.linux-foundation.org
+F:     kernel/dma/map_benchmark.c
+F:     tools/testing/selftests/dma/
+
 DMA-BUF HEAPS FRAMEWORK
 M:     Sumit Semwal <sumit.semwal@linaro.org>
 R:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
@@ -15108,7 +15115,7 @@ RENESAS CLOCK DRIVERS
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
 L:     linux-renesas-soc@vger.kernel.org
 S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-clk
 F:     Documentation/devicetree/bindings/clock/renesas,*
 F:     drivers/clk/renesas/