Linus Torvalds
3493860c76
Merge branch 'for-linus' of git://git.kernel.dk/linux-block ...
Pull block fixes from Jens Axboe:
"A small collection of fixes/changes for the current series. This
contains:
- Removal of dead code from Gu Zheng.
- Revert of two bad fixes that went in earlier in this round, marking
things as __init that were not purely used from init.
- A fix for blk_mq_start_hw_queue() using the __blk_mq_run_hw_queue(),
which could place us wrongly. Make it use the non __ variant,
which handles cases where we are called from the wrong CPU set.
From me.
- A fix for drbd, which allocates discard requests without room for
the SCSI payload. From Lars Ellenberg.
- A fix for user-after-free in the blkcg code from Tejun.
- Addition of limiting gaps in SG lists, if the hardware needs it.
This is the last pre-req patch for blk-mq to enable the full NVMe
conversion. Could wait until 3.17, but it's simple enough so would
be nice to have everything we need for the NVMe port in the 3.17
release. From me"
* 'for-linus' of git://git.kernel.dk/linux-block:
drbd: fix NULL pointer deref in blk_add_request_payload
blk-mq: blk_mq_start_hw_queue() should use blk_mq_run_hw_queue()
block: add support for limiting gaps in SG lists
bio: remove unused macro bip_vec_idx()
Revert "block: add __init to elv_register"
Revert "block: add __init to blkcg_policy_register"
blkcg: fix use-after-free in __blkg_release_rcu() by making blkcg_gq refcnt an atomic_t
floppy: format block0 read error message properly
2014-06-26 13:06:13 -07:00
block: Use macros from compiler.h instead of __attribute__((...))
2014-02-18 12:20:01 -08:00
block: move bio.c and bio-integrity.c from fs/ to block/
2014-05-19 08:34:46 -06:00
block: add support for limiting gaps in SG lists
2014-06-24 16:22:24 -06:00
Revert "block: add __init to blkcg_policy_register"
2014-06-22 16:34:11 -06:00
Revert "block: add __init to blkcg_policy_register"
2014-06-22 16:34:11 -06:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-06-19 17:56:43 -10:00
block: blk-exec.c: Cleaning up local variable address returnd
2014-06-08 19:51:31 -06:00
block: remove elv_abort_queue and blk_abort_flushes
2014-06-11 15:31:21 -06:00
bio-integrity: Convert to bvec_iter
2013-11-23 22:33:50 -08:00
block: Substitute rcu_access_pointer() for rcu_dereference_raw()
2014-02-18 12:21:26 -08:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
block/blk-lib.c: make __blkdev_issue_zeroout static
2014-05-26 17:39:09 -06:00
block: remove struct request buffer member
2014-04-15 14:03:02 -06:00
block: add support for limiting gaps in SG lists
2014-06-24 16:22:24 -06:00
blk-mq: add file comments and update copyright notices
2014-05-28 10:15:41 -06:00
blk-mq: add file comments and update copyright notices
2014-05-28 10:15:41 -06:00
blk-mq: blk_mq_unregister_hctx() can be static
2014-05-30 10:31:13 -06:00
blk-mq: bitmap tag: fix races in bt_get() function
2014-06-17 22:13:08 -07:00
blk-mq: bitmap tag: fix races on shared ::wake_index fields
2014-06-17 22:12:35 -07:00
blk-mq: blk_mq_start_hw_queue() should use blk_mq_run_hw_queue()
2014-06-25 08:22:34 -06:00
blk-mq: fix schedule from atomic context
2014-06-03 21:04:39 -06:00
block: ensure that bio_add_page() always accepts a page for an empty bio
2014-06-10 12:53:56 -06:00
block: fix regression with block enabled tagging
2014-04-09 21:54:06 -06:00
block: only allocate/free mq_usage_counter in blk-mq
2014-05-27 09:37:08 -06:00
block: Reserve only one queue tag for sync IO if only 3 tags are available
2013-06-28 21:32:27 +02:00
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-06-09 15:03:33 -07:00
block: ensure that the timer is always added
2014-05-30 15:41:39 -06:00
block: remove elv_abort_queue and blk_abort_flushes
2014-06-11 15:31:21 -06:00
mm: convert some level-less printks to pr_*
2014-06-06 16:08:18 -07:00
bsg: Remove unused function bsg_goose_queue()
2012-12-06 14:33:02 +01:00
block: add blk_rq_set_block_pc()
2014-06-06 07:57:37 -06:00
Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-06-09 15:03:33 -07:00
block: remove unrelated header files and export symbol
2014-01-21 20:18:26 -08:00
kernel-wide: fix missing validations on __get/__put/__copy_to/__copy_from_user()
2013-09-11 15:58:18 -07:00
block: Stop abusing csd.list for fifo_time
2014-02-24 14:46:32 -08:00
Revert "block: add __init to elv_register"
2014-06-22 16:34:11 -06:00
block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
2013-09-11 13:22:03 -06:00
block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
2013-11-08 09:05:31 -07:00
block: move ioprio.c from fs/ to block/
2014-05-19 11:02:18 -06:00
block: change config option name for cmdline partition parsing
2013-09-30 14:31:02 -07:00
blkcg: make CONFIG_BLK_CGROUP bool
2012-03-06 21:27:21 +01:00
block: move mm/bounce.c to block/
2014-05-19 20:01:52 -06:00
elevator: Fix a race in elevator switching
2013-07-03 13:25:24 +02:00
Revert "loop: cleanup partitions when detaching loop device"
2013-04-08 10:12:11 +02:00
block: add blk_rq_set_block_pc()
2014-06-06 07:57:37 -06:00
3493860c76