From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Feb 2015 03:16:42 +0000 (-0800)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: MMI-PSA29.97-13-9~10551
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c8c6c9ba39e3fe65cf3497d692bf6fe808ff222b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'scsi-misc' of git://git./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
---

c8c6c9ba39e3fe65cf3497d692bf6fe808ff222b
diff --cc MAINTAINERS
index 63d83bd6931f,46f344e9f629..ddc5a8cf9a8a
--- a/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