Merge 5.17-rc6 into tty-next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ae42c9e..afe238e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11460,6 +11460,13 @@ F:     Documentation/devicetree/bindings/phy/marvell,armada-3700-utmi-phy.yaml
 F:     drivers/phy/marvell/phy-mvebu-a3700-comphy.c
 F:     drivers/phy/marvell/phy-mvebu-a3700-utmi.c
 
+MARVELL ARMADA 3700 SERIAL DRIVER
+M:     Pali Rohár <pali@kernel.org>
+S:     Maintained
+F:     Documentation/devicetree/bindings/clock/marvell,armada-3700-uart-clock.yaml
+F:     Documentation/devicetree/bindings/serial/mvebu-uart.txt
+F:     drivers/tty/serial/mvebu-uart.c
+
 MARVELL ARMADA DRM SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 S:     Maintained
@@ -17762,8 +17769,10 @@ M:     David Rientjes <rientjes@google.com>
 M:     Joonsoo Kim <iamjoonsoo.kim@lge.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
 M:     Vlastimil Babka <vbabka@suse.cz>
+R:     Roman Gushchin <roman.gushchin@linux.dev>
 L:     linux-mm@kvack.org
 S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git
 F:     include/linux/sl?b*.h
 F:     mm/sl?b*
 
@@ -18540,6 +18549,12 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
 F:     drivers/rtc/rtc-sunplus.c
 
+SUNPLUS UART DRIVER
+M:     Hammer Hsieh <hammerh0314@gmail.com>
+S:     Maintained
+F:     Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
+F:     drivers/tty/serial/sunplus-uart.c
+
 SUPERH
 M:     Yoshinori Sato <ysato@users.sourceforge.jp>
 M:     Rich Felker <dalias@libc.org>