summaryrefslogtreecommitdiff
path: root/fs/nls
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-04-17 20:25:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-04-17 20:25:33 -0700
commitc98ff1d013d2d53911c4b3e8ba14c7cd141cf1ed (patch)
treed81f88120f6972923bc60098cae5323ce6e92f8e /fs/nls
parentaba5970c4da0059ed8052188a341a85ac8845d6f (diff)
parent176ddd89171ddcf661862d90c5d257877f7326d6 (diff)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "Two fixes: the libsas fix is for a problem that occurs when trying to change the cache type of an ATA device and the libiscsi one is a regression fix from this merge window" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: libsas: Reset num_scatter if libata marks qc as NODATA scsi: iscsi: Fix iSCSI cls conn state
Diffstat (limited to 'fs/nls')
0 files changed, 0 insertions, 0 deletions