Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core

Conflicts: block/blk-core.c block/blk-flush.c drivers/md/raid1.c drivers/md/raid10.c drivers/md/raid5.c fs/nilfs2/btnode.c fs/nilfs2/mdt.c Signed-off-by: Jens Axboe <[email protected]>
quicksilveramalgum · Mar 10, 2011 · 4c63f56 · 4c63f56
2 parents cafb0bf + 69d60eb
commit 4c63f56
Show file tree

Hide file tree

Showing 137 changed files with 606 additions and 1,533 deletions.
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
@@ -963,11 +963,6 @@ elevator_dispatch_fn*		fills the dispatch queue with ready requests.
 
 elevator_add_req_fn*		called to add a new request into the scheduler
 
-elevator_queue_empty_fn		returns true if the merge queue is empty.
-				Drivers shouldn't use this, but rather check
-				if elv_next_request is NULL (without losing the
-				request if one exists!)
-
 elevator_former_req_fn
 elevator_latter_req_fn		These return the request before or after the
 				one specified in disk sort order. Used by the