Merge tag 'trace-tools-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 40489f0fc08f85c0a555107687db4bbe1b716961..43b39956694ae69c29dc2acee65d99935d14ec1d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5321,6 +5321,7 @@ M:        Dan Williams <dan.j.williams@intel.com>
 L:     linux-cxl@vger.kernel.org
 S:     Maintained
 F:     drivers/cxl/
+F:     include/linux/cxl-einj.h
 F:     include/linux/cxl-event.h
 F:     include/uapi/linux/cxl_mem.h
 F:     tools/testing/cxl/
@@ -8986,6 +8987,11 @@ F:       Documentation/i2c/muxes/i2c-mux-gpio.rst
 F:     drivers/i2c/muxes/i2c-mux-gpio.c
 F:     include/linux/platform_data/i2c-mux-gpio.h
 
+GENERIC GPIO RESET DRIVER
+M:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+S:     Maintained
+F:     drivers/reset/reset-gpio.c
+
 GENERIC HDLC (WAN) DRIVERS
 M:     Krzysztof Halasa <khc@pm.waw.pl>
 S:     Maintained
@@ -13799,6 +13805,13 @@ F:     Documentation/devicetree/bindings/media/mediatek-vpu.txt
 F:     drivers/media/platform/mediatek/vcodec/
 F:     drivers/media/platform/mediatek/vpu/
 
+MEDIATEK MIPI-CSI CDPHY DRIVER
+M:     Julien Stephan <jstephan@baylibre.com>
+M:     Andy Hsieh <andy.hsieh@mediatek.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/phy/mediatek,mt8365-csi-rx.yaml
+F:     drivers/phy/mediatek/phy-mtk-mipi-csi-0-5*
+
 MEDIATEK MMC/SD/SDIO DRIVER
 M:     Chaotian Jing <chaotian.jing@mediatek.com>
 S:     Maintained
@@ -16580,7 +16593,7 @@ M:      Miklos Szeredi <miklos@szeredi.hu>
 M:     Amir Goldstein <amir73il@gmail.com>
 L:     linux-unionfs@vger.kernel.org
 S:     Supported
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
 F:     Documentation/filesystems/overlayfs.rst
 F:     fs/overlayfs/
 
@@ -17681,7 +17694,7 @@ M:      Joel Granados <j.granados@samsung.com>
 L:     linux-kernel@vger.kernel.org
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl-next
 F:     fs/proc/proc_sysctl.c
 F:     include/linux/sysctl.h
 F:     kernel/sysctl-test.c