From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2016 21:48:05 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v5.15~12439
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull SCSI fixes from James Bottomley:
 "Two small fixes.

  One prevents timeouts on mpt3sas when trying to use the secure erase
  protocol which causes the erase protocol to be aborted. The second is
  a regression in a prior fix which causes all commands to abort during
  PCI extended error recovery, which is incorrect because PCI EEH is
  independent from what's happening on the FC transport"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: do not abort all commands in the adapter during EEH recovery
  scsi: mpt3sas: Fix secure erase premature termination
---

b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c