Merge tag 'riscv/for-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c144bd6a432e6364cff8355943933d3f8086f935..500cdb68ccbc9480086015dde5f1d34265550d4d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3765,7 +3765,7 @@ F:        arch/powerpc/platforms/cell/
 
 CEPH COMMON CODE (LIBCEPH)
 M:     Ilya Dryomov <idryomov@gmail.com>
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 L:     ceph-devel@vger.kernel.org
 W:     http://ceph.com/
@@ -3777,7 +3777,7 @@ F:        include/linux/ceph/
 F:     include/linux/crush/
 
 CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 M:     Ilya Dryomov <idryomov@gmail.com>
 L:     ceph-devel@vger.kernel.org
@@ -4683,6 +4683,13 @@ L:       linux-mtd@lists.infradead.org
 S:     Supported
 F:     drivers/mtd/nand/raw/denali*
 
+DESIGNWARE EDMA CORE IP DRIVER
+M:     Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+L:     dmaengine@vger.kernel.org
+S:     Maintained
+F:     drivers/dma/dw-edma/
+F:     include/linux/dma/edma.h
+
 DESIGNWARE USB2 DRD IP DRIVER
 M:     Minas Harutyunyan <hminas@synopsys.com>
 L:     linux-usb@vger.kernel.org
@@ -6314,9 +6321,8 @@ F:        Documentation/devicetree/bindings/counter/ftm-quaddec.txt
 F:     drivers/counter/ftm-quaddec.c
 
 FLOPPY DRIVER
-M:     Jiri Kosina <jikos@kernel.org>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
-S:     Odd fixes
+S:     Orphan
+L:     linux-block@vger.kernel.org
 F:     drivers/block/floppy.c
 
 FMC SUBSYSTEM
@@ -7955,6 +7961,33 @@ L:       linux-mtd@lists.infradead.org
 S:     Maintained
 F:     drivers/mtd/nand/raw/ingenic/
 
+INGENIC JZ47xx SoCs
+M:     Paul Cercueil <paul@crapouillou.net>
+S:     Maintained
+F:     arch/mips/boot/dts/ingenic/
+F:     arch/mips/include/asm/mach-jz4740/
+F:     arch/mips/jz4740/
+F:     drivers/clk/ingenic/
+F:     drivers/dma/dma-jz4780.c
+F:     drivers/gpu/drm/ingenic/
+F:     drivers/i2c/busses/i2c-jz4780.c
+F:     drivers/iio/adc/ingenic-adc.c
+F:     drivers/irqchip/irq-ingenic.c
+F:     drivers/memory/jz4780-nemc.c
+F:     drivers/mmc/host/jz4740_mmc.c
+F:     drivers/mtd/nand/raw/ingenic/
+F:     drivers/pinctrl/pinctrl-ingenic.c
+F:     drivers/power/supply/ingenic-battery.c
+F:     drivers/pwm/pwm-jz4740.c
+F:     drivers/rtc/rtc-jz4740.c
+F:     drivers/tty/serial/8250/8250_ingenic.c
+F:     drivers/usb/musb/jz4740.c
+F:     drivers/watchdog/jz4740_wdt.c
+F:     include/dt-bindings/iio/adc/ingenic,adc.h
+F:     include/linux/mfd/ingenic-tcu.h
+F:     sound/soc/jz4740/
+F:     sound/soc/codecs/jz47*
+
 INOTIFY
 M:     Jan Kara <jack@suse.cz>
 R:     Amir Goldstein <amir73il@gmail.com>
@@ -12807,6 +12840,7 @@ F:      drivers/base/power/
 F:     include/linux/pm.h
 F:     include/linux/pm_*
 F:     include/linux/powercap.h
+F:     include/linux/intel_rapl.h
 F:     drivers/powercap/
 F:     kernel/configs/nopm.config
 
@@ -13556,9 +13590,11 @@ L:     linux-remoteproc@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/remoteproc/
+F:     Documentation/ABI/testing/sysfs-class-remoteproc
 F:     Documentation/remoteproc.txt
 F:     drivers/remoteproc/
 F:     include/linux/remoteproc.h
+F:     include/linux/remoteproc/
 
 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
@@ -13568,8 +13604,11 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 S:     Maintained
 F:     drivers/rpmsg/
 F:     Documentation/rpmsg.txt
+F:     Documentation/ABI/testing/sysfs-bus-rpmsg
 F:     include/linux/rpmsg.h
 F:     include/linux/rpmsg/
+F:     include/uapi/linux/rpmsg.h
+F:     samples/rpmsg/
 
 RENESAS CLOCK DRIVERS
 M:     Geert Uytterhoeven <geert+renesas@glider.be>
@@ -13681,7 +13720,7 @@ RISC-V ARCHITECTURE
 M:     Palmer Dabbelt <palmer@sifive.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 L:     linux-riscv@lists.infradead.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
 S:     Supported
 F:     arch/riscv/
 K:     riscv
@@ -14543,7 +14582,7 @@ M:      Paul Walmsley <paul.walmsley@sifive.com>
 L:     linux-riscv@lists.infradead.org
 T:     git git://github.com/sifive/riscv-linux.git
 S:     Supported
-K:     sifive
+K:     [^@]sifive
 N:     sifive
 
 SIFIVE FU540 SYSTEM-ON-CHIP
@@ -15857,7 +15896,7 @@ M:      Viresh Kumar <viresh.kumar@linaro.org>
 M:     Javi Merino <javi.merino@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
-F:     Documentation/thermal/cpu-cooling-api.txt
+F:     Documentation/thermal/cpu-cooling-api.rst
 F:     drivers/thermal/cpu_cooling.c
 F:     include/linux/cpu_cooling.h
 
@@ -17073,6 +17112,13 @@ S:     Maintained
 F:     drivers/virtio/virtio_input.c
 F:     include/uapi/linux/virtio_input.h
 
+VIRTIO IOMMU DRIVER
+M:     Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/iommu/virtio-iommu.c
+F:     include/uapi/linux/virtio_iommu.h
+
 VIRTUAL BOX GUEST DEVICE DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -17605,9 +17651,8 @@ L:      linux-xfs@vger.kernel.org
 W:     http://xfs.org/
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 S:     Supported
-F:     Documentation/filesystems/xfs.txt
+F:     Documentation/admin-guide/xfs.rst
 F:     Documentation/ABI/testing/sysfs-fs-xfs
-F:     Documentation/filesystems/xfs.txt
 F:     Documentation/filesystems/xfs-delayed-logging-design.txt
 F:     Documentation/filesystems/xfs-self-describing-metadata.txt
 F:     fs/xfs/