projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 645102e 14bc1df)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2018 23:59:01 +0000 (16:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Mar 2018 23:59:01 +0000 (16:59 -0700)
Pull SCSI fixes from James Bottomley:

 - one driver patch (qla2xxx) which fixes a problem caused by an
   existing regression fix (FCP discovery is failing)

 - one generic fix to a longstanding bug in libsas that causes I/O
   eventually to hang to the device in the face of ATA error recovery.

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Remove FC_NO_LOOP_ID for FCP and FC-NVMe Discovery
  scsi: libsas: defer ata device eh commands to libata

1  2 
drivers/scsi/libsas/sas_scsi_host.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libsas/sas_scsi_host.c
Simple merge
John Crispins staging tree