Merge tag 'v4.18' into rdma.git for-next

[platform/kernel/linux-rpi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 544cac8..1b2d54f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3510,7 +3510,6 @@ F:        drivers/net/ethernet/cisco/enic/
 
 CISCO VIC LOW LATENCY NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
-M:     Dave Goodell <dgoodell@cisco.com>
 S:     Supported
 F:     drivers/infiniband/hw/usnic/
 
@@ -7563,9 +7562,8 @@ S:        Maintained
 F:     drivers/firmware/iscsi_ibft*
 
 ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
-M:     Or Gerlitz <ogerlitz@mellanox.com>
 M:     Sagi Grimberg <sagi@grimberg.me>
-M:     Roi Dayan <roid@mellanox.com>
+M:     Max Gurtovoy <maxg@mellanox.com>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
 W:     http://www.openfabrics.org
@@ -12639,15 +12637,21 @@ S:    Maintained
 F:     drivers/scsi/sr*
 
 SCSI RDMA PROTOCOL (SRP) INITIATOR
-M:     Bart Van Assche <bart.vanassche@sandisk.com>
+M:     Bart Van Assche <bvanassche@acm.org>
 L:     linux-rdma@vger.kernel.org
 S:     Supported
-W:     http://www.openfabrics.org
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dad/srp-initiator.git
 F:     drivers/infiniband/ulp/srp/
 F:     include/scsi/srp.h
 
+SCSI RDMA PROTOCOL (SRP) TARGET
+M:     Bart Van Assche <bvanassche@acm.org>
+L:     linux-rdma@vger.kernel.org
+L:     target-devel@vger.kernel.org
+S:     Supported
+Q:     http://patchwork.kernel.org/project/linux-rdma/list/
+F:     drivers/infiniband/ulp/srpt/
+
 SCSI SG DRIVER
 M:     Doug Gilbert <dgilbert@interlog.com>
 L:     linux-scsi@vger.kernel.org