diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 21:54:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-09 21:54:06 -0400 |
commit | 1c54fc1efe6922b4e7ffd591739d72050976ccd6 (patch) | |
tree | 0f7f0eaa91fa06bba11da240915eb6a4040b482a /MAINTAINERS | |
parent | f4f9b8fc73f9aa93744f0e91e18f367d7766f523 (diff) | |
parent | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (diff) |
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley:
"This patch consists of the usual driver updates (qla2xxx, qla4xxx,
lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
maintained status of a long neglected driver for older hardware. In
addition there are a lot of minor fixes and cleanups and some more
updates to make scsi mq ready"
* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
include/scsi/osd_protocol.h: remove unnecessary __constant
mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
mptfusion: fix msgContext in mptctl_hp_hostinfo
acornscsi: remove linked command support
scsi/NCR5380: dprintk macro
fusion: Remove use of DEF_SCSI_QCMD
fusion: Add free msg frames to the head, not tail of list
mpt2sas: Add free smids to the head, not tail of list
mpt2sas: Remove use of DEF_SCSI_QCMD
mpt2sas: Remove uses of serial_number
mpt3sas: Remove use of DEF_SCSI_QCMD
mpt3sas: Remove uses of serial_number
qla2xxx: Use kmemdup instead of kmalloc + memcpy
qla4xxx: Use kmemdup instead of kmalloc + memcpy
qla2xxx: fix incorrect debug printk
be2iscsi: Bump the driver version
be2iscsi: Fix processing cqe for cxn whose endpoint is freed
be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
be2iscsi: Fix memory corruption in MBX path
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 77556fc91cdd..a1f4b576628a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4390,7 +4390,7 @@ S: Supported | |||
4390 | F: drivers/crypto/nx/ | 4390 | F: drivers/crypto/nx/ |
4391 | 4391 | ||
4392 | IBM Power 842 compression accelerator | 4392 | IBM Power 842 compression accelerator |
4393 | M: Robert Jennings <rcj@linux.vnet.ibm.com> | 4393 | M: Nathan Fontenot <nfont@linux.vnet.ibm.com> |
4394 | S: Supported | 4394 | S: Supported |
4395 | F: drivers/crypto/nx/nx-842.c | 4395 | F: drivers/crypto/nx/nx-842.c |
4396 | F: include/linux/nx842.h | 4396 | F: include/linux/nx842.h |
@@ -4406,12 +4406,18 @@ L: netdev@vger.kernel.org | |||
4406 | S: Supported | 4406 | S: Supported |
4407 | F: drivers/net/ethernet/ibm/ibmveth.* | 4407 | F: drivers/net/ethernet/ibm/ibmveth.* |
4408 | 4408 | ||
4409 | IBM Power Virtual SCSI/FC Device Drivers | 4409 | IBM Power Virtual SCSI Device Drivers |
4410 | M: Robert Jennings <rcj@linux.vnet.ibm.com> | 4410 | M: Nathan Fontenot <nfont@linux.vnet.ibm.com> |
4411 | L: linux-scsi@vger.kernel.org | 4411 | L: linux-scsi@vger.kernel.org |
4412 | S: Supported | 4412 | S: Supported |
4413 | F: drivers/scsi/ibmvscsi/ | 4413 | F: drivers/scsi/ibmvscsi/ibmvscsi* |
4414 | X: drivers/scsi/ibmvscsi/ibmvstgt.c | 4414 | F: drivers/scsi/ibmvscsi/viosrp.h |
4415 | |||
4416 | IBM Power Virtual FC Device Drivers | ||
4417 | M: Brian King <brking@linux.vnet.ibm.com> | ||
4418 | L: linux-scsi@vger.kernel.org | ||
4419 | S: Supported | ||
4420 | F: drivers/scsi/ibmvscsi/ibmvfc* | ||
4415 | 4421 | ||
4416 | IBM ServeRAID RAID DRIVER | 4422 | IBM ServeRAID RAID DRIVER |
4417 | P: Jack Hammer | 4423 | P: Jack Hammer |
@@ -6028,6 +6034,28 @@ M: Petr Vandrovec <petr@vandrovec.name> | |||
6028 | S: Odd Fixes | 6034 | S: Odd Fixes |
6029 | F: fs/ncpfs/ | 6035 | F: fs/ncpfs/ |
6030 | 6036 | ||
6037 | NCR 5380 SCSI DRIVERS | ||
6038 | M: Finn Thain <fthain@telegraphics.com.au> | ||
6039 | M: Michael Schmitz <schmitzmic@gmail.com> | ||
6040 | L: linux-scsi@vger.kernel.org | ||
6041 | S: Maintained | ||
6042 | F: Documentation/scsi/g_NCR5380.txt | ||
6043 | F: drivers/scsi/NCR5380.* | ||
6044 | F: drivers/scsi/arm/cumana_1.c | ||
6045 | F: drivers/scsi/arm/oak.c | ||
6046 | F: drivers/scsi/atari_NCR5380.c | ||
6047 | F: drivers/scsi/atari_scsi.* | ||
6048 | F: drivers/scsi/dmx3191d.c | ||
6049 | F: drivers/scsi/dtc.* | ||
6050 | F: drivers/scsi/g_NCR5380.* | ||
6051 | F: drivers/scsi/g_NCR5380_mmio.c | ||
6052 | F: drivers/scsi/mac_scsi.* | ||
6053 | F: drivers/scsi/pas16.* | ||
6054 | F: drivers/scsi/sun3_NCR5380.c | ||
6055 | F: drivers/scsi/sun3_scsi.* | ||
6056 | F: drivers/scsi/sun3_scsi_vme.c | ||
6057 | F: drivers/scsi/t128.* | ||
6058 | |||
6031 | NCR DUAL 700 SCSI DRIVER (MICROCHANNEL) | 6059 | NCR DUAL 700 SCSI DRIVER (MICROCHANNEL) |
6032 | M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> | 6060 | M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> |
6033 | L: linux-scsi@vger.kernel.org | 6061 | L: linux-scsi@vger.kernel.org |