Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[mirror_ubuntu-hirsute-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a69c127e357818126c7983799f9247451f7b4d8d..39e75bbefc3d734b79f40485288bb25be98b91c1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1540,6 +1540,7 @@ F:        arch/arm/mach-imx/
 F:     arch/arm/mach-mxs/
 F:     arch/arm/boot/dts/imx*
 F:     arch/arm/configs/imx*_defconfig
+F:     arch/arm64/boot/dts/freescale/imx*
 F:     drivers/clk/imx/
 F:     drivers/firmware/imx/
 F:     drivers/soc/imx/
@@ -1967,6 +1968,20 @@ M:       Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
+ARM/RDA MICRO ARCHITECTURE
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-unisoc@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/boot/dts/rda8810pl-*
+F:     drivers/clocksource/timer-rda.c
+F:     drivers/irqchip/irq-rda-intc.c
+F:     drivers/tty/serial/rda-uart.c
+F:     Documentation/devicetree/bindings/arm/rda.txt
+F:     Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
+F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
+F:     Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
+
 ARM/REALTEK ARCHITECTURE
 M:     Andreas Färber <afaerber@suse.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -7875,6 +7890,18 @@ L:       linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/ioc3_serial.c
 
+IOMAP FILESYSTEM LIBRARY
+M:     Christoph Hellwig <hch@infradead.org>
+M:     Darrick J. Wong <darrick.wong@oracle.com>
+M:     linux-xfs@vger.kernel.org
+M:     linux-fsdevel@vger.kernel.org
+L:     linux-xfs@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
+S:     Supported
+F:     fs/iomap.c
+F:     include/linux/iomap.h
+
 IOMMU DRIVERS
 M:     Joerg Roedel <joro@8bytes.org>
 L:     iommu@lists.linux-foundation.org
@@ -9082,6 +9109,11 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/phy/marvell10g.c
 
+MARVELL MVEBU THERMAL DRIVER
+M:     Miquel Raynal <miquel.raynal@bootlin.com>
+S:     Maintained
+F:     drivers/thermal/armada_thermal.c
+
 MARVELL MVNETA ETHERNET DRIVER
 M:     Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 L:     netdev@vger.kernel.org
@@ -10001,8 +10033,9 @@ F:      drivers/dma/at_xdmac.c
 
 MICROSEMI MIPS SOCS
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     linux-mips@vger.kernel.org
-S:     Maintained
+S:     Supported
 F:     arch/mips/generic/board-ocelot.c
 F:     arch/mips/configs/generic/board-ocelot.config
 F:     arch/mips/boot/dts/mscc/
@@ -15951,15 +15984,16 @@ F:    drivers/media/usb/zr364xx/
 USER-MODE LINUX (UML)
 M:     Jeff Dike <jdike@addtoit.com>
 M:     Richard Weinberger <richard@nod.at>
+M:     Anton Ivanov <anton.ivanov@cambridgegreys.com>
 L:     linux-um@lists.infradead.org
 W:     http://user-mode-linux.sourceforge.net
+Q:     https://patchwork.ozlabs.org/project/linux-um/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
 S:     Maintained
 F:     Documentation/virtual/uml/
 F:     arch/um/
 F:     arch/x86/um/
 F:     fs/hostfs/
-F:     fs/hppfs/
 
 USERSPACE COPYIN/COPYOUT (UIOVEC)
 M:     Alexander Viro <viro@zeniv.linux.org.uk>