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
Showing
- block/blk-merge.c 11 additions, 6 deletionsblock/blk-merge.c
- block/blk-mq.c 72 additions, 19 deletionsblock/blk-mq.c
- block/blk-sysfs.c 4 additions, 2 deletionsblock/blk-sysfs.c
- block/genhd.c 14 additions, 10 deletionsblock/genhd.c
- block/partition-generic.c 1 addition, 1 deletionblock/partition-generic.c
- drivers/block/mtip32xx/mtip32xx.c 0 additions, 1 deletiondrivers/block/mtip32xx/mtip32xx.c
- drivers/block/null_blk.c 21 additions, 8 deletionsdrivers/block/null_blk.c
Loading
Please register or sign in to comment