Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 20bdf22601c3f3c94720222e9c1fd363de512de9..b54288db77aa8dd957b30968698c5b42fcb570d8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2565,7 +2565,7 @@ F:        drivers/pci/controller/dwc/pcie-qcom.c
 F:     drivers/phy/qualcomm/
 F:     drivers/power/*/msm*
 F:     drivers/reset/reset-qcom-*
-F:     drivers/scsi/ufs/ufs-qcom*
+F:     drivers/ufs/host/ufs-qcom*
 F:     drivers/spi/spi-geni-qcom.c
 F:     drivers/spi/spi-qcom-qspi.c
 F:     drivers/spi/spi-qup.c
@@ -17755,6 +17755,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 F:     Documentation/devicetree/bindings/scsi/
 F:     drivers/scsi/
+F:     drivers/ufs/
 F:     include/scsi/
 
 SCSI TAPE DRIVER
@@ -20414,24 +20415,25 @@ F:    include/uapi/linux/cdrom.h
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 R:     Alim Akhtar <alim.akhtar@samsung.com>
 R:     Avri Altman <avri.altman@wdc.com>
+R:     Bart Van Assche <bvanassche@acm.org>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/ufs/
 F:     Documentation/scsi/ufs.rst
-F:     drivers/scsi/ufs/
+F:     drivers/ufs/core/
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS
 M:     Pedro Sousa <pedrom.sousa@synopsys.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     drivers/scsi/ufs/*dwc*
+F:     drivers/ufs/host/*dwc*
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS
 M:     Stanley Chu <stanley.chu@mediatek.com>
 L:     linux-scsi@vger.kernel.org
 L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/scsi/ufs/ufs-mediatek*
+F:     drivers/ufs/host/ufs-mediatek*
 
 UNSORTED BLOCK IMAGES (UBI)
 M:     Richard Weinberger <richard@nod.at>