Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block IO fixes from Jens Axboe: "Second round of updates and fixes for 3.14-rc2. Most of this stuff has been queued up for a while. The notable exception is the blk-mq changes, which are naturally a bit more in flux still. The pull request contains: - Two bug fixes for the new immutable vecs, causing crashes with raid or swap. From Kent. - Various blk-mq tweaks and fixes from Christoph. A fix for integrity bio's from Nic. - A few bcache fixes from Kent and Darrick Wong. - xen-blk{front,back} fixes from David Vrabel, Matt Rushton, Nicolas Swenson, and Roger Pau Monne. - Fix for a vec miscount with integrity vectors from Martin. - Minor annotations or fixes from Masanari Iida and Rashika Kheria. - Tweak to null_blk to do more normal FIFO processing of requests from Shlomo Pongratz. - Elevator switching bypass fix from Tejun. - Softlockup in blkdev_issue_discard() fix when !CONFIG_PREEMPT from me" * 'for-linus' of git://git.kernel.dk/linux-block: (31 commits) block: add cond_resched() to potentially long running ioctl discard loop xen-blkback: init persistent_purge_work work_struct blk-mq: pair blk_mq_start_request / blk_mq_requeue_request blk-mq: dont assume rq->errors is set when returning an error from ->queue_rq block: Fix cloning of discard/write same bios block: Fix type mismatch in ssize_t_blk_mq_tag_sysfs_show blk-mq: rework flush sequencing logic null_blk: use blk_complete_request and blk_mq_complete_request virtio_blk: use blk_mq_complete_request blk-mq: rework I/O completions fs: Add prototype declaration to appropriate header file include/linux/bio.h fs: Mark function as static in fs/bio-integrity.c block/null_blk: Fix completion processing from LIFO to FIFO block: Explicitly handle discard/write same segments block: Fix nr_vecs for inline integrity vectors blk-mq: Add bio_integrity setup to blk_mq_make_request blk-mq: initialize sg_reserved_size blk-mq: handle dma_drain_size blk-mq: divert __blk_put_request for MQ ops blk-mq: support at_head inserations for blk_execute_rq ...
No related branches found
No related tags found
Showing
- block/blk-core.c 17 additions, 3 deletionsblock/blk-core.c
- block/blk-exec.c 1 addition, 1 deletionblock/blk-exec.c
- block/blk-flush.c 37 additions, 64 deletionsblock/blk-flush.c
- block/blk-lib.c 8 additions, 0 deletionsblock/blk-lib.c
- block/blk-merge.c 62 additions, 29 deletionsblock/blk-merge.c
- block/blk-mq-tag.c 1 addition, 1 deletionblock/blk-mq-tag.c
- block/blk-mq.c 87 additions, 56 deletionsblock/blk-mq.c
- block/blk-mq.h 2 additions, 2 deletionsblock/blk-mq.h
- block/blk-sysfs.c 2 additions, 0 deletionsblock/blk-sysfs.c
- block/blk-timeout.c 1 addition, 1 deletionblock/blk-timeout.c
- block/blk.h 1 addition, 1 deletionblock/blk.h
- drivers/block/null_blk.c 33 additions, 64 deletionsdrivers/block/null_blk.c
- drivers/block/virtio_blk.c 4 additions, 3 deletionsdrivers/block/virtio_blk.c
- drivers/block/xen-blkback/blkback.c 43 additions, 23 deletionsdrivers/block/xen-blkback/blkback.c
- drivers/block/xen-blkback/common.h 4 additions, 1 deletiondrivers/block/xen-blkback/common.h
- drivers/block/xen-blkback/xenbus.c 14 additions, 0 deletionsdrivers/block/xen-blkback/xenbus.c
- drivers/block/xen-blkfront.c 7 additions, 4 deletionsdrivers/block/xen-blkfront.c
- drivers/md/bcache/bcache.h 3 additions, 1 deletiondrivers/md/bcache/bcache.h
- drivers/md/bcache/bset.c 5 additions, 2 deletionsdrivers/md/bcache/bset.c
- drivers/md/bcache/btree.c 2 additions, 2 deletionsdrivers/md/bcache/btree.c
Loading
Please register or sign in to comment