Merge 5.17-rc8 into staging-next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6ec18c4..a53ef77 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2254,7 +2254,7 @@ F:        drivers/phy/mediatek/
 ARM/Microchip (AT91) SoC support
 M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
-M:     Ludovic Desroches <ludovic.desroches@microchip.com>
+M:     Claudiu Beznea <claudiu.beznea@microchip.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://www.linux4sam.org
@@ -2739,7 +2739,7 @@ N:        stm32
 N:     stm
 
 ARM/Synaptics SoC support
-M:     Jisheng Zhang <Jisheng.Zhang@synaptics.com>
+M:     Jisheng Zhang <jszhang@kernel.org>
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -7744,8 +7744,7 @@ M:        Qiang Zhao <qiang.zhao@nxp.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/soc/fsl/qe/
-F:     include/soc/fsl/*qe*.h
-F:     include/soc/fsl/*ucc*.h
+F:     include/soc/fsl/qe/
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <leoyang.li@nxp.com>
@@ -7776,6 +7775,7 @@ F:        Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
 F:     Documentation/devicetree/bindings/soc/fsl/
 F:     drivers/soc/fsl/
 F:     include/linux/fsl/
+F:     include/soc/fsl/
 
 FREESCALE SOC FS_ENET DRIVER
 M:     Pantelis Antoniou <pantelis.antoniou@gmail.com>
@@ -13699,7 +13699,7 @@ F:      scripts/nsdeps
 NTB AMD DRIVER
 M:     Sanjay R Mehta <sanju.mehta@amd.com>
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-L:     linux-ntb@googlegroups.com
+L:     ntb@lists.linux.dev
 S:     Supported
 F:     drivers/ntb/hw/amd/
 
@@ -13707,7 +13707,7 @@ NTB DRIVER CORE
 M:     Jon Mason <jdmason@kudzu.us>
 M:     Dave Jiang <dave.jiang@intel.com>
 M:     Allen Hubbe <allenbh@gmail.com>
-L:     linux-ntb@googlegroups.com
+L:     ntb@lists.linux.dev
 S:     Supported
 W:     https://github.com/jonmason/ntb/wiki
 T:     git git://github.com/jonmason/ntb.git
@@ -13719,13 +13719,13 @@ F:    tools/testing/selftests/ntb/
 
 NTB IDT DRIVER
 M:     Serge Semin <fancer.lancer@gmail.com>
-L:     linux-ntb@googlegroups.com
+L:     ntb@lists.linux.dev
 S:     Supported
 F:     drivers/ntb/hw/idt/
 
 NTB INTEL DRIVER
 M:     Dave Jiang <dave.jiang@intel.com>
-L:     linux-ntb@googlegroups.com
+L:     ntb@lists.linux.dev
 S:     Supported
 W:     https://github.com/davejiang/linux/wiki
 T:     git https://github.com/davejiang/linux.git
@@ -17650,6 +17650,7 @@ F:      drivers/platform/x86/touchscreen_dmi.c
 SILICON LABS WIRELESS DRIVERS (for WFxxx series)
 M:     Jérôme Pouiller <jerome.pouiller@silabs.com>
 S:     Supported
+F:     Documentation/devicetree/bindings/staging/net/wireless/silabs,wfx.yaml
 F:     drivers/staging/wfx/
 
 SILICON MOTION SM712 FRAME BUFFER DRIVER
@@ -21468,7 +21469,6 @@ THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>
 L:     linux-kernel@vger.kernel.org
 S:     Buried alive in reporters
-Q:     http://patchwork.kernel.org/project/LKML/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 F:     *
 F:     */