commit e83a46bbb1d4c03defd733a64b727632a40059ad
author Tejun Heo <tj@kernel.org> Fri Mar 04 19:09:02 2011 +0100
committer Tejun Heo <tj@kernel.org> Fri Mar 04 19:09:02 2011 +0100
tree c4bc4822b2d3af1bf38095f531adc0a2aac054a5
parent da527770007fce8e4541947d47918248286da875
parent fd51469fb68b987032e46297e0a4fe9020063c20

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 <tj@kernel.org>