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
..
acpi	PCI changes for the v3.9 merge window:	2013-02-25 21:18:18 -08:00
asm-generic	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2013-02-26 19:50:22 -08:00
clocksource	arm: arch_timer: add missing inline in stub function	2013-02-11 15:16:05 -08:00
crypto
drm	drm: Add HDMI infoframe helpers	2013-02-22 08:20:10 +01:00
keys
linux	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
math-emu
media	[media] media: ov7670: Add possibility to disable pixclk during hblank	2013-02-08 14:35:06 -02:00
memory
misc
net	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
pcmcia
ras
rdma	IB/core: Add "type 2" memory windows support	2013-02-21 11:51:45 -08:00
rxrpc
scsi
sound	ASoC: Final updates for v3.9	2013-02-16 15:48:48 +01:00
target	target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors	2013-02-23 12:46:14 -08:00
trace	Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block	2013-02-28 12:52:24 -08:00
uapi	nbd: support FLUSH requests	2013-02-27 19:10:22 -08:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-02-25 16:46:44 -08:00
xen	xen: event channel arrays are xen_ulong_t and not unsigned long	2013-02-20 08:45:07 -05:00
Kbuild