Jens Axboe bb4067e341 [PATCH] elevator: fixup typo in merge logic ... The recent io scheduler allow_merge commit left the block layer with no merging, oops. This patch fixes that up. That means the CFQ change needs to be verified again, it might not fix the original bug now. But that's a seperate thing, I'll double check that tomorrow. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-12-21 22:01:04 -08:00
..
Kconfig	[PATCH] Centralise definitions of sector_t and blkcnt_t	2006-12-04 19:41:15 -08:00
Kconfig.iosched	[PATCH] BLOCK: Make it possible to disable the block layer [try #6]	2006-09-30 20:52:31 +02:00
Makefile	[PATCH] BLOCK: Make it possible to disable the block layer [try #6]	2006-09-30 20:52:31 +02:00
as-iosched.c	[PATCH] Allow as-iosched to be unloaded	2006-12-13 13:25:18 +01:00
blktrace.c	[PATCH] Allow NULL pointers in percpu_free	2006-12-07 08:39:22 -08:00
cfq-iosched.c	[PATCH] cfq-iosched: don't allow sync merges across queues	2006-12-20 11:04:12 +01:00
deadline-iosched.c	[BLOCK] Cleanup unused variable passing	2006-12-01 10:42:33 +01:00
elevator.c	[PATCH] elevator: fixup typo in merge logic	2006-12-21 22:01:04 -08:00
genhd.c	[PATCH] fault-injection capability for disk IO	2006-12-08 08:29:02 -08:00
ioctl.c	[PATCH] struct path: convert block	2006-12-08 08:28:44 -08:00
ll_rw_blk.c	[PATCH] Fixup blk_rq_unmap_user() API	2006-12-19 11:12:46 +01:00
noop-iosched.c	[BLOCK] Cleanup unused variable passing	2006-12-01 10:42:33 +01:00
scsi_ioctl.c	[PATCH] Fixup blk_rq_unmap_user() API	2006-12-19 11:12:46 +01:00