summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-13 16:39:55 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-13 16:39:55 (GMT)
commit645cc09381a14892a19f972cf36b90e2f7bdff8b (patch)
tree4e491409a10f00e734ef873bf0a286c45038114d /arch
parentfc486b03cae382601b366ab460b05e1a01bf69cd (diff)
parenta516440542afcb9647f88d12c35640baf02d07ea (diff)
downloadlinux-645cc09381a14892a19f972cf36b90e2f7bdff8b.tar.xz
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A small collection of fixes for the current rc series. This contains: - Two small blk-mq patches from Rob Elliott, cleaning up error case at init time. - A fix from Ming Lei, fixing SG merging for blk-mq where QUEUE_FLAG_SG_NO_MERGE is the default. - A dev_t minor lifetime fix from Keith, fixing an issue where a minor might be reused before all references to it were gone. - Fix from Alan Stern where an unbalanced queue bypass caused SCSI some headaches when it does a series of add/del on devices without fully registrering the queue. - A fix from me for improving the scaling of tag depth in blk-mq if we are short on memory" * 'for-linus' of git://git.kernel.dk/linux-block: blk-mq: scale depth and rq map appropriate if low on memory Block: fix unbalanced bypass-disable in blk_register_queue block: Fix dev_t minor allocation lifetime blk-mq: cleanup after blk_mq_init_rq_map failures blk-mq: pass along blk_mq_alloc_tag_set return values blk-merge: fix blk_recount_segments
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions