summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-14 11:37:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-14 11:37:50 -0700
commitb56061b04e0264f3b24f7450a3d5790437bb912a (patch)
tree0ff9b43c01d712f4d86585434bc1f3f0af4c2239 /MAINTAINERS
parent496063426dece3f47e21f9f3387205d6ca03bd2a (diff)
parent5404fb7cec7473413bc1dd2d114dbe7c291dfb15 (diff)
downloadlinux-stable-b56061b04e0264f3b24f7450a3d5790437bb912a.tar.gz
linux-stable-b56061b04e0264f3b24f7450a3d5790437bb912a.tar.bz2
linux-stable-b56061b04e0264f3b24f7450a3d5790437bb912a.zip
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley: "This is just a set of minor updates and fixes which weren't quite ready in time for the first pull request. The only real thing of note is Mike Christie is stepping down as Maintainer of iscsi to be replaced by Lee Duncan and Chris Leech" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ufs: Kconfig fix scsi: g_NCR5380: Stop using scsi_module.c scsi: g_NCR5380: Reduce overrides[] from array to struct scsi: g_NCR5380: Remove deprecated __setup scsi: ufs: Fix error return code in ufshcd_init() scsi: ufs: Data Segment only needed for WRITE DESCRIPTOR scsi: cxgb4i: Set completion bit in work request MAINTAINERS: Update open-iscsi maintainers scsi: ufs: Enable no vccq quirk for skhynix device scsi: be2iscsi: mark symbols static where possible
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a5ae0f21a8cb..fc849cabf99e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6620,10 +6620,10 @@ S: Maintained
F: drivers/firmware/iscsi_ibft*
ISCSI
-M: Mike Christie <michaelc@cs.wisc.edu>
+M: Lee Duncan <lduncan@suse.com>
+M: Chris Leech <cleech@redhat.com>
L: open-iscsi@googlegroups.com
-W: www.open-iscsi.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/mnc/linux-2.6-iscsi.git
+W: www.open-iscsi.com
S: Maintained
F: drivers/scsi/*iscsi*
F: include/scsi/*iscsi*