From: Tejun Heo Date: Fri, 4 Mar 2011 18:09:02 +0000 (+0100) Subject: Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core X-Git-Tag: v2.6.39-rc1~80^2~41^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e83a46bbb1d4c03defd733a64b727632a40059ad;p=pandora-kernel.git Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core This merge creates two set of conflicts. One is simple context conflicts caused by removal of throtl_scheduled_delayed_work() in for-linus and removal of throtl_shutdown_timer_wq() in for-2.6.39/core. The other is caused by commit 255bb490c8 (block: blk-flush shouldn't call directly into q->request_fn() __blk_run_queue()) in for-linus crashing with FLUSH reimplementation in for-2.6.39/core. The conflict isn't trivial but the resolution is straight-forward. * __blk_run_queue() calls in flush_end_io() and flush_data_end_io() should be called with @force_kblockd set to %true. * elv_insert() in blk_kick_flush() should use %ELEVATOR_INSERT_REQUEUE. Both changes are to avoid invoking ->request_fn() directly from request completion path and closely match the changes in the commit 255bb490c8. Signed-off-by: Tejun Heo --- e83a46bbb1d4c03defd733a64b727632a40059ad Reading git-diff-tree failed