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

Pull misc SCSI patches from James Bottomley:
 "This is a short patch set representing a couple of left overs from the
  merge window (debug removal and MAINTAINER changes).

  Plus one merge window regression (the local workqueue for hpsa) and a
  set of bug fixes for several issues (two for scsi-mq and the rest an
  assortment of long standing stuff, all cc'd to stable)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  sg: fix EWOULDBLOCK errors with scsi-mq
  sg: fix unkillable I/O wait deadlock with scsi-mq
  sg: fix read() error reporting
  wd719x: add missing .module to wd719x_template
  hpsa: correct compiler warnings introduced by hpsa-add-local-workqueue patch
  fixed invalid assignment of 64bit mask to host dma_boundary for scatter gather segment boundary limit.
  fcoe: Transition maintainership to Vasu
  am53c974: remove left-over debugging code

diff --cc MAINTAINERS
index 63d83bd6931f22011ac3ab1f5f18a3794e0d7ecc,46f344e9f62964fe538a4ae5010d35c8e540c267..ddc5a8cf9a8ac0078f8ca1bc99d9c48f8197214a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3930,14 -3871,8 +3930,14 @@@ S:    Supporte
  F:    Documentation/fault-injection/
  F:    lib/fault-inject.c
  
 +FBTFT Framebuffer drivers
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +F:    drivers/staging/fbtft/
 +
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
- M:    Robert Love <robert.w.love@intel.com>
+ M:    Vasu Dev <vasu.dev@intel.com>
  L:    fcoe-devel@open-fcoe.org
  W:    www.Open-FCoE.org
  S:    Supported

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge