From: Linus Torvalds Date: Sat, 14 Apr 2012 01:07:19 +0000 (-0700) Subject: Merge branch 'for-3.4/core' of git://git.kernel.dk/linux-block X-Git-Tag: v3.4-rc3~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8dd0b6d4836bce81cece60509ef3b157a420776;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'for-3.4/core' of git://git.kernel.dk/linux-block Pull block core bits from Jens Axboe: "It's a nice and quiet round this time, since most of the tricky stuff has been pushed to 3.5 to give it more time to mature. After a few hectic block IO core changes for 3.3 and 3.2, I'm quite happy with a slow round. Really minor stuff in here, the only real functional change is making the auto-unplug threshold a per-queue entity. The threshold is set so that it's low enough that we don't hold off IO for too long, but still big enough to get a nice benefit from the batched insert (and hence queue lock cost reduction). For raid configurations, this currently breaks down." * 'for-3.4/core' of git://git.kernel.dk/linux-block: block: make auto block plug flush threshold per-disk based Documentation: Add sysfs ABI change for cfq's target latency. block: Make cfq_target_latency tunable through sysfs. block: use lockdep_assert_held for queue locking block: blk_alloc_queue_node(): use caller's GFP flags instead of GFP_KERNEL --- d8dd0b6d4836bce81cece60509ef3b157a420776