Merge tag 'for-5.12/drivers-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e4a24ea..abcf7e8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1413,7 +1413,6 @@ F:        arch/arm*/include/asm/hw_breakpoint.h
 F:     arch/arm*/include/asm/perf_event.h
 F:     arch/arm*/kernel/hw_breakpoint.c
 F:     arch/arm*/kernel/perf_*
-F:     arch/arm/oprofile/common.c
 F:     drivers/perf/
 F:     include/linux/perf/arm_pmu.h
 
@@ -2071,7 +2070,7 @@ M:        Chunfeng Yun <chunfeng.yun@mediatek.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     Documentation/devicetree/bindings/phy/phy-mtk-*
+F:     Documentation/devicetree/bindings/phy/mediatek,*
 F:     drivers/phy/mediatek/
 
 ARM/Microchip (AT91) SoC support
@@ -3855,6 +3854,15 @@ S:       Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 F:     Documentation/devicetree/bindings/usb/cdns,usb3.yaml
 F:     drivers/usb/cdns3/
+X:     drivers/usb/cdns3/cdnsp*
+
+CADENCE USBSSP DRD IP DRIVER
+M:     Pawel Laszczak <pawell@cadence.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
+F:     drivers/usb/cdns3/
+X:     drivers/usb/cdns3/cdns3*
 
 CADET FM/AM RADIO RECEIVER DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
@@ -4051,7 +4059,6 @@ W:        http://www.ibm.com/developerworks/power/cell/
 F:     arch/powerpc/include/asm/cell*.h
 F:     arch/powerpc/include/asm/spu*.h
 F:     arch/powerpc/include/uapi/asm/spu*.h
-F:     arch/powerpc/oprofile/*cell*
 F:     arch/powerpc/platforms/cell/
 
 CELLWISE CW2015 BATTERY DRIVER
@@ -4591,6 +4598,7 @@ L:        linux-samsung-soc@vger.kernel.org
 S:     Supported
 F:     arch/arm/mach-exynos/pm.c
 F:     drivers/cpuidle/cpuidle-exynos.c
+F:     include/linux/platform_data/cpuidle-exynos.h
 
 CPUIDLE DRIVER - ARM PSCI
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
@@ -11229,6 +11237,8 @@ L:      linux-usb@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
+F:     Documentation/devicetree/bindings/usb/mediatek,*
+F:     drivers/usb/host/xhci-mtk*
 F:     drivers/usb/mtu3/
 
 MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@ -13279,15 +13289,6 @@ S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 F:     sound/drivers/opl4/
 
-OPROFILE
-M:     Robert Richter <rric@kernel.org>
-L:     oprofile-list@lists.sf.net
-S:     Maintained
-F:     arch/*/include/asm/oprofile*.h
-F:     arch/*/oprofile/
-F:     drivers/oprofile/
-F:     include/linux/oprofile.h
-
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 M:     Mark Fasheh <mark@fasheh.com>
 M:     Joel Becker <jlbec@evilplan.org>
@@ -14579,6 +14580,12 @@ L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/staging/qlge/
 
+QLOGIC QLGE 10Gb ETHERNET DRIVER
+M:     Coiby Xu <coiby.xu@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/networking/device_drivers/qlogic/qlge.rst
+
 QM1D1B0004 MEDIA DRIVER
 M:     Akihiro Tsukada <tskd08@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -16901,12 +16908,6 @@ F:     include/linux/static_call*.h
 F:     kernel/jump_label.c
 F:     kernel/static_call.c
 
-STEC S1220 SKD DRIVER
-M:     Damien Le Moal <Damien.LeMoal@wdc.com>
-L:     linux-block@vger.kernel.org
-S:     Maintained
-F:     drivers/block/skd*[ch]
-
 STI AUDIO (ASoC) DRIVERS
 M:     Arnaud Pouliquen <arnaud.pouliquen@st.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)