Linus Torvalds ee89f81252 Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block ... Pull block IO core bits from Jens Axboe: "Below are the core block IO bits for 3.9. It was delayed a few days since my workstation kept crashing every 2-8h after pulling it into current -git, but turns out it is a bug in the new pstate code (divide by zero, will report separately). In any case, it contains: - The big cfq/blkcg update from Tejun and and Vivek. - Additional block and writeback tracepoints from Tejun. - Improvement of the should sort (based on queues) logic in the plug flushing. - _io() variants of the wait_for_completion() interface, using io_schedule() instead of schedule() to contribute to io wait properly. - Various little fixes. You'll get two trivial merge conflicts, which should be easy enough to fix up" Fix up the trivial conflicts due to hlist traversal cleanups (commit b67bfe0d42: "hlist: drop the node parameter from iterators"). * 'for-3.9/core' of git://git.kernel.dk/linux-block: (39 commits) block: remove redundant check to bd_openers() block: use i_size_write() in bd_set_size() cfq: fix lock imbalance with failed allocations drivers/block/swim3.c: fix null pointer dereference block: don't select PERCPU_RWSEM block: account iowait time when waiting for completion of IO request sched: add wait_for_completion_io[_timeout] writeback: add more tracepoints block: add block_{touch|dirty}_buffer tracepoint buffer: make touch_buffer() an exported function block: add @req to bio_{front|back}_merge tracepoints block: add missing block_bio_complete() tracepoint block: Remove should_sort judgement when flush blk_plug block,elevator: use new hashtable implementation cfq-iosched: add hierarchical cfq_group statistics cfq-iosched: collect stats from dead cfqgs cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats() blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock block: RCU free request_queue blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge() ...		2013-02-28 12:52:24 -08:00
..
00-INDEX	cgroups: move cgroup_event_listener.c to tools/cgroup	2013-01-07 09:41:28 -08:00
blkio-controller.txt	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
cgroups.txt	cgroup, cpuset: remove cgroup_subsys->post_clone()	2012-11-19 08:13:39 -08:00
cpuacct.txt	Documentation: fix echo command in cgroups/cpuacct.txt	2011-07-23 10:58:08 -07:00
cpusets.txt	cpuset: use N_MEMORY instead N_HIGH_MEMORY	2012-12-12 17:38:32 -08:00
devices.txt
freezer-subsystem.txt	cgroup_freezer: implement proper hierarchy support	2012-11-09 10:52:30 -08:00
hugetlb.txt	hugetlb/cgroup: add HugeTLB controller documentation	2012-07-31 18:42:41 -07:00
memcg_test.txt	cgroups: move cgroup_event_listener.c to tools/cgroup	2013-01-07 09:41:28 -08:00
memory.txt	kmem: add slab-specific documentation about the kmem controller	2012-12-18 15:02:15 -08:00
net_prio.txt	netprio_cgroup: allow nesting and inherit config on cgroup creation	2012-11-22 07:32:47 -08:00
resource_counter.txt	res_counter: return amount of charges after res_counter_uncharge()	2012-12-18 15:02:12 -08:00