diff options
author | 2016-11-22 13:48:05 -0800 | |
---|---|---|
committer | 2016-11-22 13:48:05 -0800 | |
commit | b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c (patch) | |
tree | 0d88e197bdc4690faf6a155fd4ebbbffdc7f225a /net/unix/af_unix.c | |
parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (diff) | |
parent | Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes (diff) | |
download | wireguard-linux-b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c.tar.xz wireguard-linux-b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c.zip |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions