[GIT PULL] Follow up block pull request for 2.6.38-rc1

From: Jens Axboe
Date: Fri Jan 14 2011 - 16:22:07 EST


Hi Linus,

Mainly pushing this now to get Tejuns tested fix out the door. Also
included are two CFQ optimizations.

Please pull.

git://git.kernel.dk/linux-2.6-block.git for-linus

Shaohua Li (2):
block cfq: make queue preempt work for queues from different workload
block cfq: compensate preempted queue even if it has no slice assigned

Tejun Heo (1):
block: restore multiple bd_link_disk_holder() support

block/cfq-iosched.c | 28 +++++++++++++--
drivers/md/dm-table.c | 1 +
drivers/md/md.c | 1 +
fs/block_dev.c | 93 +++++++++++++++++++++++++++++++++++++++---------
include/linux/fs.h | 8 ++++-
5 files changed, 108 insertions(+), 23 deletions(-)

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/