diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-15 19:15:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-15 19:15:48 +0200 |
commit | eeba2dfa6a0d1cf40056e3a00ec21206c640eeca (patch) | |
tree | d88bc13cb9889b72cee67346d03adac7dff7745c /drivers/acpi/button.c | |
parent | Merge tag 'drm-fixes-for-v4.17-rc6-urgent' of git://people.freedesktop.org/~a... (diff) | |
parent | scsi: aacraid: Correct hba_send to include iu_type (diff) | |
download | linux-eeba2dfa6a0d1cf40056e3a00ec21206c640eeca.tar.xz linux-eeba2dfa6a0d1cf40056e3a00ec21206c640eeca.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 driver fixes: aacraid to fix an unknown IU type on task
management functions which causes a firmware fault and vmw_pvscsi to
change a return code to retry the operation instead of causing an
immediate error"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: aacraid: Correct hba_send to include iu_type
scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts
Diffstat (limited to 'drivers/acpi/button.c')
0 files changed, 0 insertions, 0 deletions