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

pULL SCSI fixes from James Bottomley:
 "This consists of four real fixes and three MAINTAINER updates.

  Three of the fixes are obvious (the DIX and atomic allocation are bug
  on and warn on fixes and the other is just trivial) and the ipr one is
  a bit more involved but is required because without it, the card
  double completes aborted commands and causes a kernel oops"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  MAINTAINERS: ibmvscsi driver maintainer change
  MAINTAINERS: ibmvfc driver maintainer change
  MAINTAINERS: Remove self as isci maintainer
  scsi_debug: test always evaluates to false, || should be used instead
  scsi: Avoid crashing if device uses DIX but adapter does not support it
  scsi_debug: use atomic allocation in resp_rsup_opcodes
  ipr: wait for aborted command responses

1 files changed, 2 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6b7a694bf454..2ebb056cbe0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4750,14 +4750,14 @@ S:	Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual SCSI Device Drivers
-M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvscsi*
 F:      drivers/scsi/ibmvscsi/viosrp.h
 
 IBM Power Virtual FC Device Drivers
-M:      Brian King <brking@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvfc*
@@ -4946,7 +4946,6 @@ K:	\b(ABS|SYN)_MT_
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
 M:      Artur Paszkiewicz <artur.paszkiewicz@intel.com>
-M:      Dave Jiang <dave.jiang@intel.com>
 L:      linux-scsi@vger.kernel.org
 T:      git git://git.code.sf.net/p/intel-sas/isci
 S:      Supported