diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 14:39:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-02 14:39:35 -0800 |
| commit | ad2be3796ff4c834e5c102d5455e76ee07dcf71d (patch) | |
| tree | f3cfa4950b401cb011069fb7bd1b16eb741ce687 /Makefile | |
| parent | 12267166c582f43a41829ffa77be2e7e72d5d4dd (diff) | |
| parent | ff150a76ae782a2d8730945c869869f77f2fcd39 (diff) | |
Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of six patches consisting of:
- two MAINTAINER updates
- two scsi-mq fixs for the old parallel interface (not every request
is tagged and we need to set the right flags to populate the SPI
tag message)
- a fix for a memory leak in scatterlist traversal caused by a
preallocation update in 3.17
- an ipv6 fix for cxgbi"
[ The scatterlist fix also came in separately through the block layer tree ]
* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
MAINTAINERS: ufs - remove self
MAINTAINERS: change hpsa and cciss maintainer
libcxgbi : support ipv6 address host_param
scsi: set REQ_QUEUE for the blk-mq case
Revert "block: all blk-mq requests are tagged"
lib/scatterlist: fix memory leak with scsi-mq
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions