Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block into for-2.6.33

2026-09-26 18:16:26 +00:00 · 2009-11-03 10:59:10 +01:00 · 2009-11-03 10:59:10 +01:00 · 59131d8e0a
commit 59131d8e0a
parent 012abeea66 4f570f995f
46 changed files with 22432 additions and 1634 deletions
--- a/Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg
+++ b/Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg
--- a/Documentation/blockdev/drbd/DRBD-data-packets.svg
+++ b/Documentation/blockdev/drbd/DRBD-data-packets.svg
--- a/Documentation/blockdev/drbd/README.txt
+++ b/Documentation/blockdev/drbd/README.txt
--- a/Documentation/blockdev/drbd/conn-states-8.dot
+++ b/Documentation/blockdev/drbd/conn-states-8.dot
--- a/Documentation/blockdev/drbd/disk-states-8.dot
+++ b/Documentation/blockdev/drbd/disk-states-8.dot
--- a/Documentation/blockdev/drbd/drbd-connection-state-overview.dot
+++ b/Documentation/blockdev/drbd/drbd-connection-state-overview.dot
--- a/Documentation/blockdev/drbd/node-states-8.dot
+++ b/Documentation/blockdev/drbd/node-states-8.dot
--- a/13
+++ b/13
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
--- a/block/Makefile
+++ b/block/Makefile
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
--- a/drivers/block/drbd/Makefile
+++ b/drivers/block/drbd/Makefile
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
--- a/drivers/block/drbd/drbd_strings.c
+++ b/drivers/block/drbd/drbd_strings.c
--- a/drivers/block/drbd/drbd_vli.h
+++ b/drivers/block/drbd/drbd_vli.h
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
--- a/drivers/block/drbd/drbd_wrappers.h
+++ b/drivers/block/drbd/drbd_wrappers.h
--- a/fs/aio.c
+++ b/fs/aio.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
--- a/include/linux/drbd_tag_magic.h
+++ b/include/linux/drbd_tag_magic.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
--- a/include/linux/lru_cache.h
+++ b/include/linux/lru_cache.h
--- a/lib/Kconfig
+++ b/lib/Kconfig
--- a/lib/Makefile
+++ b/lib/Makefile
--- a/lib/lru_cache.c
+++ b/lib/lru_cache.c