From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 5e152b4..4a7df24 master -> origin## # errFrom /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 c21fd1a..fad4dab master -> scsi-misc Checking out files: 32% (884/2745) Checking out files: 33% (906/2745Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. block/blk.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Auto-merging drivers/ata/libata-scsi.c Auto-merging drivers/block/drbd/drbd_int.h Auto-merging fs/block_dev.c Merge made by recursive. Documentation/ABI/testing/sysfs-block | 64 +++ Documentation/blockdev/cciss.txt | 15 + block/blk-cgroup.c | 200 +++++++-- block/blk-cgroup.h | 40 ++- block/blk-core.c | 32 +-- block/blk-exec.c | 2 +- block/blk-flush.c | 16 +- block/blk-ioc.c | 3 + block/blk-lib.c | 82 +--- block/blk-settings.c | 9 +- block/blk-sysfs.c | 3 +- block/blk-throttle.c | 313 ++++++++++--- block/blk.h | 20 + block/cfq-iosched.c | 232 +++++++--- block/elevator.c | 11 +- drivers/ata/libata-scsi.c | 13 +- drivers/block/Kconfig | 21 + drivers/block/Makefile | 1 + drivers/block/cciss.c | 571 ++++++++++++++++++----- drivers/block/cciss.h | 11 +- drivers/block/cciss_cmd.h | 11 + drivers/block/cciss_scsi.c | 41 +- drivers/block/cciss_scsi.h | 4 - drivers/block/drbd/drbd_actlog.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 6 +- drivers/block/drbd/drbd_int.h | 19 +- drivers/block/drbd/drbd_main.c | 37 ++- drivers/block/drbd/drbd_nl.c | 127 ++++-- drivers/block/drbd/drbd_receiver.c | 68 ++-- drivers/block/drbd/drbd_req.c | 20 +- drivers/block/drbd/drbd_req.h | 5 +- drivers/block/drbd/drbd_worker.c | 98 +++-- drivers/block/loop.c | 11 +- drivers/block/paride/pcd.c | 2 + drivers/block/xen-blkback/Makefile | 3 + drivers/block/xen-blkback/blkback.c | 824 +++++++++++++++++++++++++++++++++ drivers/block/xen-blkback/common.h | 233 ++++++++++ drivers/block/xen-blkback/xenbus.c | 768 ++++++++++++++++++++++++++++++ drivers/block/xen-blkfront.c | 51 ++- drivers/cdrom/viocd.c | 4 +- drivers/ide/ide-cd.c | 3 +- drivers/scsi/sr.c | 2 +- fs/block_dev.c | 17 +- fs/partitions/check.c | 8 +- fs/splice.c | 33 +- include/linux/blk_types.h | 2 - include/linux/blkdev.h | 15 +- include/linux/drbd.h | 10 +- include/linux/drbd_tag_magic.h | 2 +- include/linux/genhd.h | 2 +- include/linux/lru_cache.h | 12 +- include/xen/interface/io/blkif.h | 13 + mm/backing-dev.c | 4 +- 53 files changed, 3475 insertions(+), 641 deletions(-) create mode 100644 drivers/block/xen-blkback/Makefile create mode 100644 drivers/bFrom . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 16% (842/5088) Checking out files: 17% (865/5088) Checking out files: 18% (916/5088) Checking out files: 19% (967/5088) Checking out files: 20% (1018/5088) Checking out files: 21% (1069/5088) Checking out files: 22% (1120/5088) Checking out files: 22% (1149/5088) Checking out files: 23% (1171/5088) Checking out files: 24% (1222/5088) Checking out files: 25% (1272/5088) Checking out files: 25% (1319/5088) Checking out files: 26% (1323/5088) Checking out files: 27% (1374/5088) Checking out files: 28% (1425/5088) Checking out files: 29% (1476/5088) Checking out files: 29% (1509/5088) Checking out files: 30% (1527/5088) Checking out files: 31% (1578/5088) Checking out files: 32% (1629/5088) Checking out files: 33% (1680/5088) Checking out files: 33% (1695/5088) Checking out files: 34% (1730/5088) Checking out files: 35% (1781/5088) Checking out files: 36% (1832/5088) Checking out files: 37% (1883/5088) Checking out files: 38% (1934/5088) Checking out files: 38% (1962/5088) Checking out files: 39% (1985/5088) Checking out files: 40% (2036/5088) Checking out files: 41% (2087/5088) Checking out files: 42% (2137/5088) Checking out files: 42% (2146/5088) Checking out files: 43% (2188/5088) Checking out files: 44% (2239/5088) Checking out files: 45% (2290/5088) Checking out files: 46% (2341/5088) Checking out files: 46% (2358/5088) Checking out files: 47% (2392/5088) Checking out files: 48% (2443/5088) Checking out files: 49% (2494/5088) Checking out files: 49% (2533/5088) Checking out files: 50% (2544/5088) Checking out files: 51% (2595/5088) Checking out files: 52% (2646/5088) Checking out files: 52% (2684/5088) Checking out files: 53% (2697/5088) Checking out files: 54% (2748/5088) Checking out files: 55% (2799/5088) Checking out files: 56% (2850/5088) Checking out files: 57% (2901/5088) Checking out files: 57% (2948/5088) Checking out files: 58% (2952/5088) Checking out files: 59% (3002/5088) Checking out files: 60% (3053/5088) Checking out files: 61% (3104/5088) Checking out files: 61% (3107/5088) Checking out files: 62% (3155/5088) Checking out files: 63% (3206/5088) Checking out files: 64% (3257/5088) Checking out files: 65% (3308/5088) Checking out files: 66% (3359/5088) Checking out files: 66% (3385/5088) Checking out files: 67% (3409/5088) Checking out files: 68% (3460/5088) Checking out files: 69% (3511/5088) Checking out files: 70% (3562/5088) Checking out files: 7## # gitrebase /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git master scsi-post-merge merge-base ## First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge to 2.6.39-stor4. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.39-stor4 6c2bc46] 2.6.39-stor4 Committer: James Bottomley Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly: git config --global user.name "Your Name" git config --global user.email you@example.com After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/storage-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/storage-tree/log- ## files: 90% (4580/5088) Checking out files: 91% (4631/5088) Checking out files: 92% (4681/5088) Checking out files: 93% (4732/5088) Checking out files: 93% (4752/5088) Checking out files: 94% (4783/5088) Checking out files: 95% (4834/5088) Checking out files: 96% (4885/5088) Checking out files: 97% (4936/5088) Checking out files: 98% (4987/5088) Checking out files: 98% (4996/5088) Checking out files: 99% (5038/5088) Checking out files: 100% (5088/5088) Checking out files: 100% (5088/5088), done. Switched to branch 'device-mapper' Checking out files: 21% (1097/5088) Checking out files: 22% (1120/5088) Checking out files: 23% (1171/5088) Checking out files: 24% (1222/5088) Checking out files: 25% (1272/5088) Checking out files: 26% (1323/5088) Checking out files: 26% (1357/5088) Checking out files: 27% (1374/5088) Checking out files: 28% (1425/5088) Checking out files: 29% (1476/5088) Checking out files: 30% (1527/5088) Checking out files: 31% (1578/5088) Checking out files: 32% (1629/5088) Checking out files: 32% (1679/5088) Checking out files: 33% (1680/5088) Checking out files: 34% (1730/5088) Checking out files: 35% (1781/5088) Checking out files: 36% (1832/5088) Checking out files: 37% (1883/5088) Checking out files: 38% (1934/5088) Checking out files: 38% (1937/5088) Checking out files: 39% (1985/5088) Checking out files: 40% (2036/5088) Checking out files: 41% (2087/5088) Checking out files: 42% (2137/5088) Checking out files: 43% (2188/5088) Checking out files: 44% (2239/5088) Checking out files: 44% (2249/5088) Checking out files: 45% (2290/5088) Checking out files: 46% (2341/5088) Checking out files: 47% (2392/5088) Checking out files: 48% (2443/5088) Checking out files: 49% (2494/5088) Checking out files: 49% (2512/5088) Checking out files: 50% (2544/5088) Checking out files: 51% (2595/5088) Checking out files: 52% (2646/5088) Checking out files: 53% (2697/5088) Checking out files: 54% (2748/5088) Checking out files: 54% (2776/5088) Checking out files: 55% (2799/5088) Checking out files: 56% (2850/5088) Checking out files: 57% (2901/5088) Checking out files: 58% (2952/5088) Checking out files: 59% (3002/5088) Checking out files: 60% (3053/5088) Checking out files: 61% (3104/5088) Checking out files: 61% (3125/5088) Checking out files: 62% (3155/5088) Checking out files: 63% (3206/5088) Checking out files: 64% (3257/5088) Checking out files: 65% (3308/5088) Checking out files: 66% (3359/5088) Checking out files: 67% (3409/5088) Checking out files: 68% (3460/5088) Checking out files: 68% (3499/5088) Checking out files: 69% (3511/5088) Checking out files: 70% (3562/5088) Checking out files: 71% (3613/5088) Checking out files: 72% (3664/5088) Checking out files: 73% (3715/5088) Checking out files: 74% (3766/5088) Checking out files: 75% (3816/5088) Checking out files: 75% (3830/5088) Checking out files: 76% (3867/5088) Checking out files: 77% (3918/5088) Checking out files: 78% (3969/5088) Checking out files: 79% (4020/5088) Checking out files: 80% (4071/5088) Checking out files: 80% (4100/5088) Checking out files: 81% (4122/5088) Checking out files: 82% (4173/5088) Checking out files: 83% (4224/5088) Checking out files: 84% (4274/5088) Checking out files: 85% (4325/5088) Checking out files: 85% (4347/5088) Checking out files: 86% (4376/5088) Checking out files: 87% (4427/5088) Checking out files: 88% (4478/5088) Checking out files: 89% (4529/5088) Checking out files: 90% (4580/5088) Checking out files: 91% (4631/5088) Checking out files: 91% (4637/5088) Checking out files: 92% (4681/5088) Checking out files: 93% (4732/5088) Checking out files: 94% (4783/5088) Checking out files: 95% (4834/5088) Checking out files: 96% (4885/5088) Checking out files: 96% (4917/5088) Checking out files: 97% (4936/5088) Checking out files: 98% (4987/5088) Checking out files: 99% (5038/5088) Checking out files: 100% (5088/5088) Checking out files: 100% (5088/5088), done. Switched to branch '2.6.39-stor4' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 973da3d...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 19% (2882/14873) Checking out files: 20% (2975/14873) Checking out files: 21% (3124/14873) Checking out files: 22% (3273/14873) Checking out files: 23% (3421/14873) Checking out files: 23% (3452/14873) Checking out files: 24% (3570/14873) Checking out files: 25% (3719/14873) Checking out files: 26% (3867/14873) Checking out files: 26% (3875/14873) Checking out files: 27% (4016/14873) Checking out files: 28% (4165/14873) Checking out files: 29% (4314/14873) Checking out files: 29% (4318/14873) Checking out files: 30% (4462/14873) Checking out files: 30% (4572/14873) Checking out files: 31% (4611/14873) Checking out files: 32% (4760/14873) Checking out files: 33% (4909/14873) Checking out files: 33% (4937/14873) Checking out files: 34% (5057/14873) Checking out files: 34% (5116/14873) Checking out files: 35% (5206/14873) Checking out files: 35% (5344/14873) Checking out files: 36% (5355/14873) Checking out files: 37% (5504/14873) Checking out files: 37% (5545/14873) Checking out files: 38% (5652/14873) Checking out files: 38% (5744/14873) Checking out files: 39% (5801/14873) Checking out files: 40% (5950/14873) Checking out files: 41% (6098/14873) Checking out files: 42% (6247/14873) Checking out files: 42% (6285/14873) Checking out files: 43% (6396/14873) Checking out files: 44% (6545/14873) Checking out files: 45% (6693/14873) Checking out files: 45% (6708/14873) Checking out files: 46% (6842/14873) Checking out files: 47% (6991/14873) Checking out files: 47% (7018/14873) Checking out files: 48% (7140/14873) Checking out files: 48% (7273/14873) Checking out files: 49% (7288/14873) Checking out files: 50% (7437/14873) Checking out files: 51% (7586/14873) Checking out files: 51% (7604/14873) Checking out files: 52% (7734/14873) Checking out files: 52% (7878/14873) Checking out files: 53% (7883/14873) Checking out files: 54% (8032/14873) Checking out files: 54% (8131/14873) Checking out files: 55% (8181/14873) Checking out files: 56% (8329/14873) Checking out files: 56% (8382/14873) Checking out files: 57% (8478/14873) Checking out files: 58% (8627/14873) Checking out files: 58% (8637/14873) Checking out files: 59% (8776/14873) Checking out files: 59% (8877/14873) Checking out files: 60% (8924/14873) Checking out files: 61% (9073/14873) Checking out files: 61% (9083/14873) Checking out files: 62% (9222/14873) Checking out files: 62% (9301/14873) Checking out files: 63% (9370/14873) Checking out files: 64% (9519/14873) Checking out files: 64% (9605/14873) Checking out files: 65% (9668/14873) Checking out files: 65% (9810/14873) Checking out files: 66% (9817/14873) Checking out files: 67% (9965/14873) Checking out files: 68% (10114/14873) Checking out files: 69% (10263/14873) Checking out files: 69% (10299/14873) Checking out files: 70% (10412/14873) Checking out files: 71% (10560/14873) Checking out files: 71% (10679/14873) Checking out files: 72% (10709/14873) Checking out files: 73% (10858/14873) Checking out files: 74% (11007/14873) Checking out files: 74% (11124/14873) Checking out files: 75% (11155/14873) Checking out files: 76% (11304/14873) Checking out files: 76% (11367/14873) Checking out files: 77% (11453/14873) Checking out files: 78% (11601/14873) Checking out files: 78% (11663/14873) Checking out files: 79% (11750/14873) Checking out files: 79% (11897/14873) Checking out files: 80% (11899/14873) Checking out files: 81% (12048/14873) Checking out files: 81% (12097/14873) Checking out files: 82% (12196/14873) Checking out files: 82% (12320/14873) Checking out files: 83% (12345/14873) Checking out files: 84% (12494/14873) Checking out files: 84% (12532/14873) Checking out files: 85% (12643/14873) Checking out files: 85% (12736/14873) Checking out files: 86% (12791/14873) Checking out files: 87% (12940/14873) Checking out files: 87% (12963/14873) Checking out files: 88% (13089/14873) Checking out files: 88% (13214/14873) Checking out files: 89% (13237/14873) Checking out files: 90% (13386/14873) Checking out files: 90% (13437/14873) Checking out files: 91% (13535/14873) Checking out files: 92% (13684/14873) Checking out files: 92% (13687/14873) Checking out files: 93% (13832/14873) Checking out files: 94% (13981/14873) Checking out files: 94% (13985/14873) Checking out files: 95% (14130/14873) Checking out files: 95% (14222/14873) Checking out files: 96% (14279/14873) Checking out files: 97% (14427/14873) Checking out files: 97% (14471/14873) Checking out files: 98% (14576/14873) Checking out files: 98% (14676/14873) Checking out files: 99% (14725/14873) Checking out files: 100% (14873/14873) Checking out files: 100% (14873/14873), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-stor4' From . * branch scsi-post-merge -> FETCH_HEAD