Files
tegra-linux-noble/include/linux
Tejun Heo e83a46bbb1 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>
2011-03-04 19:09:02 +01:00
..
2011-01-20 18:30:17 -08:00
2011-01-20 18:30:17 -08:00
2011-01-10 08:51:44 -08:00
2011-01-15 20:07:45 -05:00
2011-01-13 08:03:12 -08:00
2011-01-25 12:43:49 +01:00
2011-01-10 08:51:44 -08:00
2011-01-12 20:16:43 -05:00
2011-01-17 03:26:26 -05:00
2011-01-10 08:51:44 -08:00
2011-01-07 17:50:27 +11:00
2011-01-07 17:50:23 +11:00
2011-01-24 14:45:11 +10:30
2011-01-10 07:38:53 -08:00
2011-01-10 22:11:23 +01:00
2011-01-21 11:55:31 +01:00
2011-01-13 17:32:31 -08:00
2011-02-01 08:23:22 +10:00
2011-01-13 17:32:47 -08:00
2011-02-13 16:54:24 -08:00
2011-01-24 14:45:11 +10:30
2010-12-22 10:27:53 +01:00
2011-01-14 13:12:45 +00:00
2011-01-13 17:32:41 -08:00
2011-01-13 17:32:46 -08:00
2011-01-13 17:32:43 -08:00
2011-01-16 13:47:07 -05:00
2011-01-13 21:44:34 -08:00
2011-01-10 15:40:52 -05:00
2011-01-13 17:32:43 -08:00
2011-01-16 13:47:07 -05:00
2011-01-13 08:03:21 -08:00
2011-01-14 02:36:43 +00:00
2011-01-13 08:03:18 -08:00
2011-01-13 17:32:42 -08:00
2011-01-07 17:50:27 +11:00
2011-01-13 08:03:19 -08:00
2011-01-13 17:32:42 -08:00
2011-02-28 18:00:31 -08:00
2011-01-13 08:03:20 -08:00
2010-12-20 09:37:33 +01:00
2011-01-24 14:45:11 +10:30
2011-01-13 08:03:24 -08:00