diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-21 21:10:17 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-21 21:10:17 +0100 |
commit | 1f02071358301e376f5a54e40531db37a1d7c7ab (patch) | |
tree | b069f697cdc214d30071daf5cda2b123544d683e /mm/swap_slots.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes (diff) | |
download | linux-1f02071358301e376f5a54e40531db37a1d7c7ab.tar.xz linux-1f02071358301e376f5a54e40531db37a1d7c7ab.zip |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Nine small fixes: the biggest is probably finally sorting out Kconfig
issues with lpfc nvme. There are some performance fixes for megaraid
and hpsa and a static checker fix"
[ Johannes Thumshirn points out that there still seems to be more lpfc
vs nvme config issues. Oh well. - Linus ]
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: lpfc: Finalize Kconfig options for nvme
scsi: ufs: don't check unsigned type for a negative value
scsi: hpsa: do not timeout reset operations
scsi: hpsa: limit outstanding rescans
scsi: hpsa: update check for logical volume status
scsi: megaraid_sas: Driver version upgrade
scsi: megaraid_sas: raid6 also require cpuSel check same as raid5
scsi: megaraid_sas: add correct return type check for ldio hint logic for raid1
scsi: megaraid_sas: enable intx only if msix request fails
Diffstat (limited to 'mm/swap_slots.c')
0 files changed, 0 insertions, 0 deletions