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 is the usual mix of driver updates (srp, ipr, scsi_debug,
  NCR5380, fnic, 53c974, ses, wd719x, hpsa, megaraid_sas).

  Of those, wd7a9x is new and 53c974 is a rewrite of the old tmscsim
  driver and the extensive work by Finn Thain rewrites all the NCR5380
  based drivers.

  There's also extensive infrastructure updates: a new logging
  infrastructure for sense information and a rewrite of the tagged
  command queue API and an assortment of minor updates"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (183 commits)
  scsi: set fmt to NULL scsi_extd_sense_format() by default
  libsas: remove task_collector mode
  wd719x: remove dma_cache_sync call
  scsi_debug: add Report supported opcodes+tmfs; Compare and write
  scsi_debug: change SCSI command parser to table driven
  scsi_debug: add Capacity Changed Unit Attention
  scsi_debug: append inject error flags onto scsi_cmnd object
  scsi_debug: pinpoint invalid field in sense data
  wd719x: Add firmware documentation
  wd719x: Introduce Western Digital WD7193/7197/7296 PCI SCSI card driver
  eeprom-93cx6: Add (read-only) support for 8-bit mode
  esas2r: fix an oversight in setting return value
  esas2r: fix an error path in esas2r_ioctl_handler
  esas2r: fir error handling in do_fm_api
  scsi: add SPC-3 command definitions
  scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16
  scsi: remove scsi_driver owner field
  scsi: move scsi_dispatch_cmd to scsi_lib.c
  scsi: stop passing a gfp_mask argument down the command setup path
  scsi: remove scsi_next_command
  ...

1 files changed, 9 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c721042e7e45..8ef028d3afc7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2862,11 +2862,10 @@ F:	Documentation/networking/dmfe.txt
 F:      drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
-M:      Kurt Garloff <garloff@suse.de>
-W:      http://www.garloff.de/kurt/linux/dc390/
-M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+M:      Hannes Reinecke <hare@suse.de>
+L:      linux-scsi@vger.kernel.org
 S:      Maintained
-F:      drivers/scsi/tmscsim.*
+F:      drivers/scsi/am53c974.c
 
 DC395x SCSI driver
 M:      Oliver Neukum <oliver@neukum.org>
@@ -5991,10 +5990,13 @@ W:	http://linuxtv.org
 S:      Odd Fixes
 F:      drivers/media/parport/pms*
 
-MEGARAID SCSI DRIVERS
-M:      Neela Syam Kolli <megaraidlinux@lsi.com>
+MEGARAID SCSI/SAS DRIVERS
+M:      Kashyap Desai <kashyap.desai@avagotech.com>
+M:      Sumit Saxena <sumit.saxena@avagotech.com>
+M:      Uday Lingala <uday.lingala@avagotech.com>
+L:      megaraidlinux.pdl@avagotech.com
 L:      linux-scsi@vger.kernel.org
-W:      http://megaraid.lsilogic.com
+W:      http://www.lsi.com
 S:      Maintained
 F:      Documentation/scsi/megaraid.txt
 F:      drivers/scsi/megaraid.*
@@ -6305,7 +6307,6 @@ F:	drivers/scsi/g_NCR5380.*
 F:      drivers/scsi/g_NCR5380_mmio.c
 F:      drivers/scsi/mac_scsi.*
 F:      drivers/scsi/pas16.*
-F:      drivers/scsi/sun3_NCR5380.c
 F:      drivers/scsi/sun3_scsi.*
 F:      drivers/scsi/sun3_scsi_vme.c
 F:      drivers/scsi/t128.*