Merge 7e2cd21e02b3 ("Merge tag 'tty-6.0-rc7' of git://git.kernel.org/pub/scm/linux...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d2114f9..d29fce0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -671,7 +671,8 @@ F:  fs/afs/
 F:     include/trace/events/afs.h
 
 AGPGART DRIVER
-M:     David Airlie <airlied@linux.ie>
+M:     David Airlie <airlied@redhat.com>
+L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm
 F:     drivers/char/agp/
@@ -5245,6 +5246,7 @@ F:        block/blk-throttle.c
 F:     include/linux/blk-cgroup.h
 
 CONTROL GROUP - CPUSET
+M:     Waiman Long <longman@redhat.com>
 M:     Zefan Li <lizefan.x@bytedance.com>
 L:     cgroups@vger.kernel.org
 S:     Maintained
@@ -6753,7 +6755,7 @@ F:        Documentation/devicetree/bindings/display/panel/samsung,lms380kf01.yaml
 F:     drivers/gpu/drm/panel/panel-widechips-ws2401.c
 
 DRM DRIVERS
-M:     David Airlie <airlied@linux.ie>
+M:     David Airlie <airlied@gmail.com>
 M:     Daniel Vetter <daniel@ffwll.ch>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
@@ -8652,8 +8654,8 @@ F:        drivers/input/touchscreen/goodix*
 
 GOOGLE ETHERNET DRIVERS
 M:     Jeroen de Borst <jeroendb@google.com>
-R:     Catherine Sullivan <csully@google.com>
-R:     David Awogbemila <awogbemila@google.com>
+M:     Catherine Sullivan <csully@google.com>
+R:     Shailend Chand <shailend@google.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/device_drivers/ethernet/google/gve.rst
@@ -9122,7 +9124,7 @@ S:        Maintained
 F:     drivers/dma/hisi_dma.c
 
 HISILICON GPIO DRIVER
-M:     Luo Jiaxing <luojiaxing@huawei.com>
+M:     Jay Fang <f.fangjian@huawei.com>
 L:     linux-gpio@vger.kernel.org
 S:     Maintained
 F:     drivers/gpio/gpio-hisi.c
@@ -13292,7 +13294,7 @@ F:      include/dt-bindings/dma/at91.h
 MICROCHIP AT91 SERIAL DRIVER
 M:     Richard Genoud <richard.genoud@gmail.com>
 S:     Maintained
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/tty/serial/atmel_serial.c
 F:     drivers/tty/serial/atmel_serial.h
 
@@ -13300,7 +13302,7 @@ MICROCHIP AT91 USART MFD DRIVER
 M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/mfd/at91-usart.c
 F:     include/dt-bindings/mfd/at91-usart.h
 
@@ -13308,7 +13310,7 @@ MICROCHIP AT91 USART SPI DRIVER
 M:     Radu Pirea <radu_nicolae.pirea@upb.ro>
 L:     linux-spi@vger.kernel.org
 S:     Supported
-F:     Documentation/devicetree/bindings/mfd/atmel-usart.txt
+F:     Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml
 F:     drivers/spi/spi-at91-usart.c
 
 MICROCHIP AUDIO ASOC DRIVERS
@@ -16857,6 +16859,7 @@ F:      drivers/net/ethernet/qualcomm/emac/
 
 QUALCOMM ETHQOS ETHERNET DRIVER
 M:     Vinod Koul <vkoul@kernel.org>
+R:     Bhupesh Sharma <bhupesh.sharma@linaro.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/qcom,ethqos.txt
@@ -19959,6 +19962,7 @@ S:      Supported
 F:     drivers/net/team/
 F:     include/linux/if_team.h
 F:     include/uapi/linux/if_team.h
+F:     tools/testing/selftests/net/team/
 
 TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 M:     "Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>
@@ -21565,7 +21569,7 @@ F:      drivers/gpio/gpio-virtio.c
 F:     include/uapi/linux/virtio_gpio.h
 
 VIRTIO GPU DRIVER
-M:     David Airlie <airlied@linux.ie>
+M:     David Airlie <airlied@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 R:     Gurchetan Singh <gurchetansingh@chromium.org>
 R:     Chia-I Wu <olvaffe@gmail.com>