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

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 05ebeb5b9495544b09ad0ee0e677f1a5e0e2071d..266c2f4981078055cf82af108b897c222afef379 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1851,6 +1851,7 @@ T:        git https://github.com/AsahiLinux/linux.git
 F:     Documentation/devicetree/bindings/arm/apple.yaml
 F:     Documentation/devicetree/bindings/arm/apple/*
 F:     Documentation/devicetree/bindings/clock/apple,nco.yaml
+F:     Documentation/devicetree/bindings/dma/apple,admac.yaml
 F:     Documentation/devicetree/bindings/i2c/apple,i2c.yaml
 F:     Documentation/devicetree/bindings/interrupt-controller/apple,*
 F:     Documentation/devicetree/bindings/iommu/apple,dart.yaml
@@ -1864,6 +1865,7 @@ F:        Documentation/devicetree/bindings/power/apple*
 F:     Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
 F:     arch/arm64/boot/dts/apple/
 F:     drivers/clk/clk-apple-nco.c
+F:     drivers/dma/apple-admac.c
 F:     drivers/i2c/busses/i2c-pasemi-core.c
 F:     drivers/i2c/busses/i2c-pasemi-platform.c
 F:     drivers/iommu/apple-dart.c
@@ -5509,7 +5511,7 @@ W:        http://www.chelsio.com
 F:     drivers/net/ethernet/chelsio/cxgb3/
 
 CXGB3 ISCSI DRIVER (CXGB3I)
-M:     Karen Xie <kxie@chelsio.com>
+M:     Varun Prakash <varun@chelsio.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -5541,7 +5543,7 @@ W:        http://www.chelsio.com
 F:     drivers/net/ethernet/chelsio/cxgb4/
 
 CXGB4 ISCSI DRIVER (CXGB4I)
-M:     Karen Xie <kxie@chelsio.com>
+M:     Varun Prakash <varun@chelsio.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 W:     http://www.chelsio.com
@@ -6102,6 +6104,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
 F:     Documentation/devicetree/bindings/dma/
 F:     Documentation/driver-api/dmaengine/
 F:     drivers/dma/
+F:     include/dt-bindings/dma/
 F:     include/linux/dma/
 F:     include/linux/dmaengine.h
 F:     include/linux/of_dma.h
@@ -6272,14 +6275,6 @@ F:       Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-drive
 F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
 F:     drivers/net/ethernet/freescale/dpaa2/dpsw*
 
-DPT_I2O SCSI RAID DRIVER
-M:     Adaptec OEM Raid Solutions <aacraid@microsemi.com>
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-W:     http://www.adaptec.com/
-F:     drivers/scsi/dpt*
-F:     drivers/scsi/dpt/
-
 DRBD DRIVER
 M:     Philipp Reisner <philipp.reisner@linbit.com>
 M:     Lars Ellenberg <lars.ellenberg@linbit.com>
@@ -10188,7 +10183,8 @@ S:      Supported
 Q:     https://patchwork.kernel.org/project/linux-dmaengine/list/
 F:     drivers/dma/ioat*
 
-INTEL IADX DRIVER
+INTEL IDXD DRIVER
+M:     Fenghua Yu <fenghua.yu@intel.com>
 M:     Dave Jiang <dave.jiang@intel.com>
 L:     dmaengine@vger.kernel.org
 S:     Supported
@@ -15858,6 +15854,14 @@ L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/controller/dwc/*spear*
 
+PCI DRIVER FOR XILINX VERSAL CPM
+M:     Bharat Kumar Gogada <bharat.kumar.gogada@amd.com>
+M:     Michal Simek <michal.simek@amd.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
+F:     drivers/pci/controller/pcie-xilinx-cpm.c
+
 PCMCIA SUBSYSTEM
 M:     Dominik Brodowski <linux@dominikbrodowski.net>
 S:     Odd Fixes
@@ -20799,6 +20803,13 @@ L:     linux-mediatek@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/ufs/host/ufs-mediatek*
 
+UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS
+M:     Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+L:     linux-renesas-soc@vger.kernel.org
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     drivers/ufs/host/ufs-renesas.c
+
 UNSORTED BLOCK IMAGES (UBI)
 M:     Richard Weinberger <richard@nod.at>
 L:     linux-mtd@lists.infradead.org