From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 6313e3c..0fcdcfb master -> origin/mas## #From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 + 429ef7c...77703cb master -> scsi-misc (forced update) Checking out files: 43% (119/271) Checking out files: 44% (Removing 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 ## Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. block/blk-map.c | 5 ++- block/blk-merge.c | 6 ++-- block/blk-settings.c | 25 +--------------------- block/blk-sysfs.c | 2 +- block/blk-throttle.c | 39 +++++++++++++++++++++++------------ drivers/block/drbd/drbd_receiver.c | 14 +++++++----- drivers/block/drbd/drbd_req.h | 3 +- drivers/block/drbd/drbd_worker.c | 10 ++++++++- drivers/md/dm-table.c | 5 ---- drivers/md/md.c | 3 -- drivers/scsi/scsi_lib.c | 3 +- include/linux/blkdev.h | 9 +++++-- 12 files changed, 60 insertions(+), 64 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Already up-to-date! Merge made by recursive. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merging drivers/scsi/ipr.c Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- drivers/ata/libata-scsi.c | 60 ++--- drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- include/linux/libata.h | 6 +- 9 files changed, 574 insertions(+), 48 deletions(-) create mode 100644 drivers/ata/acard-ahci.c ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-change-clone-bi_private-pointer-during-cleanup.patch dm-crypt-scale-to-multiple-CPUs.patch dm-crypt-use-IO-thread-for-reads-only-if-mempool-is-exhausted.patch dm-delay-unplug-queue.patch dm-emulate-BLKRRPART-ioctl.patch dm-export-dm_disk.patch dm-extract-region_hash.patch dm-flakey.patch dm-handle-clone-reprocessing.patch dm-io-delay-queue-unplug-in-kcopyd.patch dm-io-remove-BIO_RW_SYNCIO-flag-from-kcopyd.patch dm-ioctl-allow-rename-Checking out files: 43% (285/659) Checking out files: 44% (290/659) Checking out files: 45% (297/659) Checking out files: 46% (304/659) Checking out files: 47% (310/659) Checking out files: 48% (317/659) Checking out files: 49% (323/659) Checking out files: 50% (330/659) Checking out files: 51% (337/659) Checking out files: 52% (343/659) Checking out files: 53% (350/659) Checking out files: 54% (356/659) Checking out files: 55% (363/659) Checking out files: 56% (370/659) Checking out files: 57% (376/659) Checking out files: 58% (383/659) Checking out files: 59% (389/659) Checking out files: 60% (396/659) Checking out files: 61% (402/659) Checking out files: 62% (409/659) Checking out files: 63% (416/659) Checking out files: 64% (422/659) Checking out files: 65% (429/659) Checking out files: 66% (435/659) Checking out files: 67% (442/659) Checking out files: 68% (449/659) Checking out files: 69% (455/659) Checking out files: 70% (462/659) Checking out files: 71% (468/659) Checking out files: 72% (475/659) Checking out files: 73% (482/659) Checking out files: 74% (488/659) Checking out files: 75% (495/659) Checking out files: 76% (501/659) Checking out files: 77% (508/659) Checking out files: 78% (515/659) Checking out files: 79% (521/659) Checking out files: 80% (528/659) Checking out files: 81% (534/659) Checking out files: 81% (536/659) Checking out files: 82% (541/659) Checking out files: 83% (547/659) Checking out files: 84% (554/659) Checking out files: 85% (561/659) Checking out files: 86% (567/659) Checking out files: 87% (574/659) Checking out files: 88% (580/659) Checking out files: 89% (587/659) Checking out files: 90% (594/659) Checking out files: 91% (600/659) Checking out files: 92% (607/659) Checking out files: 93% (613/659) Checking out files: 94% (620/659) Checking out files: 95% (627/659) Checking out files: 96% (633/659) C## # 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.37-rc5-stor7. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc5-stor7 6661f7c] 2.6.37-rc5-stor7 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 If the identity used for this commit is wrong, you can fix it with: git commit --amend --author='Your Name ' 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- ## Checking out files: 57% (376/659) Checking out files: 58% (383/659) Checking out files: 59% (389/659) Checking out files: 60% (396/659) Checking out files: 61% (402/659) Checking out files: 62% (409/659) Checking out files: 63% (416/659) Checking out files: 64% (422/659) Checking out files: 65% (429/659) Checking out files: 66% (435/659) Checking out files: 67% (442/659) Checking out files: 68% (449/659) Checking out files: 69% (455/659) Checking out files: 70% (462/659) Checking out files: 71% (468/659) Checking out files: 72% (475/659) Checking out files: 73% (482/659) Checking out files: 74% (488/659) Checking out files: 74% (493/659) Checking out files: 75% (495/659) Checking out files: 76% (501/659) Checking out files: 77% (508/659) Checking out files: 78% (515/659) Checking out files: 79% (521/659) Checking out files: 80% (528/659) Checking out files: 81% (534/659) Checking out files: 82% (541/659) Checking out files: 83% (547/659) Checking out files: 84% (554/659) Checking out files: 85% (561/659) Checking out files: 86% (567/659) Checking out files: 87% (574/659) Checking out files: 88% (580/659) Checking out files: 89% (587/659) Checking out files: 90% (594/659) Checking out files: 91% (600/659) Checking out files: 92% (607/659) Checking out files: 93% (613/659) Checking out files: 94% (620/659) Checking out files: 95% (627/659) Checking out files: 96% (633/659) Checking out files: 97% (640/659) Checking out files: 98% (646/659) Checking out files: 99% (653/659) Checking out files: 100% (659/659) Checking out files: 100% (659/659), done. Switched to branch '2.6.37-rc5-stor7' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 21131c3...2bfc96a master -> scsi-post-merge (forced update) Checking out files: 16% (1933/11390) Checking out files: 17% (1937/11390) Checking out files: 18% (2051/11390) Checking out files: 19% (2165/11390) Checking out files: 19% (2175/11390) Checking out files: 20% (2278/11390) Checking out files: 21% (2392/11390) Checking out files: 21% (2421/11390) Checking out files: 22% (2506/11390) Checking out files: 23% (2620/11390) Checking out files: 23% (2628/11390) Checking out files: 24% (2734/11390) Checking out files: 24% (2834/11390) Checking out files: 25% (2848/11390) Checking out files: 26% (2962/11390) Checking out files: 26% (3058/11390) Checking out files: 27% (3076/11390) Checking out files: 28% (3190/11390) Checking out files: 28% (3290/11390) Checking out files: 29% (3304/11390) Checking out files: 30% (3417/11390) Checking out files: 30% (3527/11390) Checking out files: 31% (3531/11390) Checking out files: 32% (3645/11390) Checking out files: 33% (3759/11390) Checking out files: 33% (3774/11390) Checking out files: 34% (3873/11390) Checking out files: 34% (3979/11390) Checking out files: 35% (3987/11390) Checking out files: 36% (4101/11390) Checking out files: 37% (4215/11390) Checking out files: 37% (4225/11390) Checking out files: 38% (4329/11390) Checking out files: 39% (4443/11390) Checking out files: 39% (4453/11390) Checking out files: 40% (4556/11390) Checking out files: 41% (4670/11390) Checking out files: 41% (4700/11390) Checking out files: 42% (4784/11390) Checking out files: 42% (4876/11390) Checking out files: 43% (4898/11390) Checking out files: 44% (5012/11390) Checking out files: 44% (5103/11390) Checking out files: 45% (5126/11390) Checking out files: 46% (5240/11390) Checking out files: 46% (5322/11390) Checking out files: 47% (5354/11390) Checking out files: 48% (5468/11390) Checking out files: 48% (5512/11390) Checking out files: 49% (5582/11390) Checking out files: 50% (5695/11390) Checking out files: 50% (5720/11390) Checking out files: 51% (5809/11390) Checking out files: 52% (5923/11390) Checking out files: 52% (5944/11390) Checking out files: 53% (6037/11390) Checking out files: 53% (6105/11390) Checking out files: 54% (6151/11390) Checking out files: 55% (6265/11390) Checking out files: 55% (6266/11390) Checking out files: 56% (6379/11390) Checking out files: 56% (6448/11390) Checking out files: 57% (6493/11390) Checking out files: 58% (6607/11390) Checking out files: 58% (6627/11390) Checking out files: 59% (6721/11390) Checking out files: 59% (6775/11390) Checking out files: 60% (6834/11390) Checking out files: 60% (6881/11390) Checking out files: 61% (6948/11390) Checking out files: 62% (7062/11390) Checking out files: 62% (7070/11390) Checking out files: 63% (7176/11390) Checking out files: 64% (7290/11390) Checking out files: 64% (7297/11390) Checking out files: 65% (7404/11390) Checking out files: 66% (7518/11390) Checking out files: 66% (7575/11390) Checking out files: 67% (7632/11390) Checking out files: 68% (7746/11390) Checking out files: 68% (7785/11390) Checking out files: 69% (7860/11390) Checking out files: 70% (7973/11390) Checking out files: 71% (8087/11390) Checking out files: 71% (8117/11390) Checking out files: 72% (8201/11390) Checking out files: 73% (8315/11390) Checking out files: 73% (8346/11390) Checking out files: 74% (8429/11390) Checking out files: 74% (8484/11390) Checking out files: 75% (8543/11390) Checking out files: 75% (8613/11390) Checking out files: 76% (8657/11390) Checking out files: 76% (8755/11390) Checking out files: 77% (8771/11390) Checking out files: 77% (8881/11390) Checking out files: 78% (8885/11390) Checking out files: 79% (8999/11390) Checking out files: 79% (9031/11390) Checking out files: 80% (9112/11390) Checking out files: 80% (9157/11390) Checking out files: 81% (9226/11390) Checking out files: 81% (9294/11390) Checking out files: 82% (9340/11390) Checking out files: 83% (9454/11390) Checking out files: 83% (9509/11390) Checking out files: 84% (9568/11390) Checking out files: 85% (9682/11390) Checking out files: 85% (9754/11390) Checking out files: 86% (9796/11390) Checking out files: 87% (9910/11390) Checking out files: 87% (9976/11390) Checking out files: 88% (10024/11390) Checking out files: 89% (10138/11390) Checking out files: 89% (10216/11390) Checking out files: 90% (10251/11390) Checking out files: 91% (10365/11390) Checking out files: 91% (10442/11390) Checking out files: 92% (10479/11390) Checking out files: 93% (10593/11390) Checking out files: 93% (10663/11390) Checking out files: 94% (10707/11390) Checking out files: 95% (10821/11390) Checking out files: 95% (10916/11390) Checking out files: 96% (10935/11390) Checking out files: 97% (11049/11390) Checking out files: 97% (11150/11390) Checking out files: 98% (11163/11390) Checking out files: 99% (11277/11390) Checking out files: 99% (11317/11390) Checking out files: 100% (11390/11390) Checking out files: 100% (11390/11390), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc5-stor7' From . * branch scsi-post-merge -> FETCH_HEAD