You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 b67bfe0d42ca: "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() ...		12 years ago
..
Makefile	sched: Move cputime code to its own file	13 years ago
auto_group.c	sched: split out css_online/css_offline from tg creation/destruction	12 years ago
auto_group.h	Revert "sched/autogroup: Fix crash on reboot when autogroup is disabled"	12 years ago
clock.c	…
core.c	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	12 years ago
cpupri.c	sched/rt: Move rt specific bits into new header file	12 years ago
cpupri.h	…
cputime.c	cputime: Use local_clock() for full dynticks cputime accounting	12 years ago
debug.c	Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	12 years ago
fair.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	12 years ago
features.h	Automatic NUMA Balancing V11	12 years ago
idle_task.c	sched/nohz: Rewrite and fix load-avg computation -- again	13 years ago
rt.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	12 years ago
sched.h	sched/rt: Move rt specific bits into new header file	12 years ago
stats.c	sched: Fix /proc/sched_stat failure on very very large systems	12 years ago
stats.h	…
stop_task.c	sched: Fix migration thread runtime bogosity	13 years ago