diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 17:24:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 17:24:12 -0700 |
commit | f0d98d85831bf1a3b1f56f8c14af60797aaca536 (patch) | |
tree | b63abe91e769ef429774e6383c9a552a07a288f6 /Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt | |
parent | ca71b3ba4c78c2c05b44be9b257a4127223f0b0c (diff) | |
parent | 4d42680330e1ac6f9aee715311a198038264747f (diff) | |
download | linux-f0d98d85831bf1a3b1f56f8c14af60797aaca536.tar.gz linux-f0d98d85831bf1a3b1f56f8c14af60797aaca536.tar.bz2 linux-f0d98d85831bf1a3b1f56f8c14af60797aaca536.zip |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of minor (and safe changes) that didn't make the initial
pull request plus some bug fixes.
The status handling code is actually a running regression from the
previous merge window which had an incomplete fix (now reverted) and
most of the remaining bug fixes are for problems older than the
current merge window"
[ Side note: this merge also takes the base kernel git repository to 6+
million objects for the first time. Technically we hit it a couple of
merges ago already if you count all the tag objects, but now it
reaches 6M+ objects reachable from HEAD.
I was joking around that that's when I should switch to 5.0, because
3.0 happened at the 2M mark, and 4.0 happened at 4M objects. But
probably not, even if numerology is about as good a reason as any.
- Linus ]
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: devinfo: Add Microsoft iSCSI target to 1024 sector blacklist
scsi: cxgb4i: silence overflow warning in t4_uld_rx_handler()
scsi: dpt_i2o: Use after free in I2ORESETCMD ioctl
scsi: core: Make scsi_result_to_blk_status() recognize CONDITION MET
scsi: core: Rename __scsi_error_from_host_byte() into scsi_result_to_blk_status()
Revert "scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte()"
scsi: aacraid: Insure command thread is not recursively stopped
scsi: qla2xxx: Correct setting of SAM_STAT_CHECK_CONDITION
scsi: qla2xxx: correctly shift host byte
scsi: qla2xxx: Fix race condition between iocb timeout and initialisation
scsi: qla2xxx: Avoid double completion of abort command
scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure
scsi: scsi_dh: Don't look for NULL devices handlers by name
scsi: core: remove redundant assignment to shost->use_blk_mq
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog/nuvoton,npcm-wdt.txt')
0 files changed, 0 insertions, 0 deletions