diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 01:26:35 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 01:26:35 +0400 |
commit | f1a7cd0ffe8c4ecd57a55aab7cfd4c813e0f5f3d (patch) | |
tree | 93d657a5c14b86f00b839a5d2af3ce7f8d3f1401 /include/linux/c2port.h | |
parent | aaeb2554337217dfa4eac2fcc90da7be540b9a73 (diff) | |
parent | 14b83e172f0bc83b8dcf78ee8b1844beeffb418d (diff) | |
download | linux-f1a7cd0ffe8c4ecd57a55aab7cfd4c813e0f5f3d.tar.xz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block into next
Pull block follow-up bits from Jens Axboe:
"A few minor (but important) fixes for blk-mq for the -rc1 window.
- Hot removal potential oops fix for single queue devices. From me.
- Two merged patches in late May meant that we accidentally lost a
fix for freeing an active queue. Fix that up. From me.
- A change of the blk_mq_tag_to_rq() API, passing in blk_mq_tags, to
make life considerably easier for scsi-mq. From me.
- A schedule-while-atomic fix from Ming Lei, which would hit if the
tag space was exhausted.
- Missing __percpu annotation in one place in blk-mq. Found by the
magic Wu compile bot due to code being moved around by the previous
patch, but it's actually an older issue. From Ming Lei.
- Clearing of tag of a flush request at end_io time. From Ming Lei"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: mq flush: clear flush_rq's tag in flush_end_io()
blk-mq: let blk_mq_tag_to_rq() take blk_mq_tags as the main parameter
blk-mq: fix regression from commit 624dbe475416
blk-mq: handle NULL req return from blk_map_request in single queue mode
blk-mq: fix sparse warning on missed __percpu annotation
blk-mq: fix schedule from atomic context
blk-mq: move blk_mq_get_ctx/blk_mq_put_ctx to mq private header
Diffstat (limited to 'include/linux/c2port.h')
0 files changed, 0 insertions, 0 deletions