From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Apr 2017 20:31:08 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: MMI-PSA29.97-13-9~5779
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f9cedc76fc7d9bc916127f8fe1287a249891d40;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull SCSI fix from James Bottomley:
 "Our final fix before the 4.12 release (hopefully).

  It's an error leg again: the fix to not bug on empty DMA transfers is
  returning the wrong code and confusing the block layer"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: return correct blkprep status code in case scsi_init_io() fails.
---

8f9cedc76fc7d9bc916127f8fe1287a249891d40