diff options
| author | Linus Torvalds | 2020-12-05 10:59:21 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-12-05 10:59:21 -0800 |
| commit | 312b0bcd402a003053914e13d962e82be906cf41 (patch) | |
| tree | d8acdb3a174bf196625f24480719f0a418f55cf6 /drivers/nfc | |
| parent | 8762340561397fce0f0b41220ed9619101c870d0 (diff) | |
| parent | 85dad327d9b58b4c9ce08189a2707167de392d23 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Four small fixes in two drivers.
The mpt3sas fixes are all problems with timeout under unusual
conditions, and the storvsc is a missed incoming packet validation
and a missed error return"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: mpt3sas: Increase IOCInit request timeout to 30s
scsi: mpt3sas: Fix ioctl timeout
scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
scsi: storvsc: Fix error return in storvsc_probe()
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions