From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 May 2016 20:28:39 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: android-x86-7.1-r1~1345
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b02b1fbdd338f70e49efa9ca9899214134526701;p=android-x86%2Fkernel.git

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

Pull SCSI fixes from James Bottomley:
 "This is a set of four fixes noticed in the merge window.  The aacraid
  one is an optimisation, the mp3sas one fixes a spurious printk, the
  sd_check_events one fixes a theoretical race and the failed zero
  length commands fixes a bug in our completion/retry routines that has
  been causing problems in the field"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  aacraid: do not activate events on non-SRC adapters
  mpt3sas: add missing curly braces
  sd: get disk reference in sd_check_events()
  scsi_lib: correctly retry failed zero length REQ_TYPE_FS commands
---

b02b1fbdd338f70e49efa9ca9899214134526701