From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 2cedcc4..6313e3c master -> origin/mast## From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 151f52f..6313e3c master -> scsi-misc Checking out files: 0% (3/435) Checking out files: 1% (5/435) Checking oRemoving patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Updating 6313e3c..7cfec60 Fast-forward block/bsg.c | 8 ++++++++ drivers/s390/scsi/zfcp_erp.c | 11 ++++++++--- drivers/s390/scsi/zfcp_fsf.c | 11 ++++++----- drivers/s390/scsi/zfcp_scsi.c | 7 ++----- drivers/scsi/osd/osd_initiator.c | 4 ++-- drivers/scsi/pmcraid.c | 4 +++- drivers/scsi/pmcraid.h | 6 ++---- drivers/scsi/scsi_error.c | 26 ++------------------------ drivers/scsi/scsi_lib.c | 5 ----- 9 files changed, 33 insertions(+), 49 deletions(-) ## # 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 ## 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-to-fill-empty-uuid.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-disable-blk_abort_queue.patch dm-mpath-improve-err-mesgs.patch dm-mpath-pg_timeout.patch dm-mpath-refactor-pg_init-trigger.patch dm-multisnap-common.patch dm-multisnap-daniel.patch dm-multisnap-mikulas-alloc.patch dm-multisnap-mikulas-blocks.patch dm-multisnap-mikulas-btree.patch dm-multisnap-mikulas-commit.patch dm-multisnap-mikulas-common.patch dm-multisnap-mikulas-config.patch dm-multisnap-mikulas-delete.patch dm-multisnap-mikulas-freelist.patch dm-multisnap-mikulas-headers.patch dm-multisnap-mikulas-io.patch dm-multisnap-mikulas-snaps.patch dm-raid1-clear-region_hash-on-suspend.patch dm-raid1-increase-dm-io-pages.patch dm-raid1-mempool-bug-workaround-reversion.patch dm-raid1-read-balancing.patch dm-raid1-separate-region_hash-interface-part2-to-be-split-and-fixed.patch dm-raid1-support-discard.patch dm-raid45-to-be-split.patch dm-region_hash-change-primes.patch dm-remove-dm_mutex-after-bkl-conversion.patch dm-remove-extra-locking-when-changing-device-size.patch dm-remove-struct-clone_info.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-release-memory-if-invalid.patch dm-split-bios-into-only-two-pieces.patch dm-table-extend-device-name-lookups.patch dm-table-limit-max_segments-when-no-merge_bvec-fn.patch dm-throttle.patch dm-tidy-io-iniChecking out files: 31% (105/329) Checking out files: 32% (106/329) Checking out files: 33% (109/329) Checking out files: 34% (112/329) Checking out files: 35% (116/329) Checking out files: 36% (119/329) Checking out files: 37% (122/329) Checking out files: 38% (126/329) Checking out files: 39% (129/329) Checking out files: 40% (132/329) Checking out files: 41% (135/329) Checking out files: 41% (136/329) Checking out files: 42% (139/329) Checking out files: 43% (142/329) Checking out files: 44% (145/329) Checking out files: 45% (149/329) Checking out files: 46% (1## # 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-stor1. Already up-to-date. ## # check ## No prior to diff against ## # label ## [2.6.37-rc5-stor1 bf060af] 2.6.37-rc5-stor1 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- ## : 71% (234/329) Checking out files: 72% (237/329) Checking out files: 73% (241/329) Checking out files: 74% (244/329) Checking out files: 75% (247/329) Checking out files: 76% (251/329) Checking out files: 77% (254/329) Checking out files: 78% (257/329) Checking out files: 79% (260/329) Checking out files: 80% (264/329) Checking out files: 81% (267/329) Checking out files: 81% (269/329) Checking out files: 82% (270/329) Checking out files: 83% (274/329) Checking out files: 84% (277/329) Checking out files: 85% (280/329) Checking out files: 86% (283/329) Checking out files: 87% (287/329) Checking out files: 88% (290/329) Checking out files: 89% (293/329) Checking out files: 90% (297/329) Checking out files: 91% (300/329) Checking out files: 92% (303/329) Checking out files: 93% (306/329) Checking out files: 94% (310/329) Checking out files: 95% (313/329) Checking out files: 96% (316/329) Checking out files: 97% (320/329) Checking out files: 98% (323/329) Checking out files: 99% (326/329) Checking out files: 100% (329/329) Checking out files: 100% (329/329), done. Switched to branch 'device-mapper' Switched to branch '2.6.37-rc5-stor1' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 8b7fa34...2bfc96a master -> scsi-post-merge (forced update) Checking out files: 3% (406/11315) Checking out files: 4% (453/11315) Checking out files: 5% (566/11315) Checking out files: 6% (679/11315) Checking out files: 7% (793/11315) Checking out files: 8% (906/11315) Checking out files: 9% (1019/11315) Checking out files: 10% (1132/11315) Checking out files: 11% (1245/11315) Checking out files: 12% (1358/11315) Checking out files: 13% (1471/11315) Checking out files: 14% (1585/11315) Checking out files: 14% (1618/11315) Checking out files: 15% (1698/11315) Checking out files: 16% (1811/11315) Checking out files: 16% (1837/11315) Checking out files: 17% (1924/11315) Checking out files: 17% (1984/11315) Checking out files: 18% (2037/11315) Checking out files: 19% (2150/11315) Checking out files: 19% (2177/11315) Checking out files: 20% (2263/11315) Checking out files: 20% (2354/11315) Checking out files: 21% (2377/11315) Checking out files: 22% (2490/11315) Checking out files: 22% (2494/11315) Checking out files: 23% (2603/11315) Checking out files: 23% (2690/11315) Checking out files: 24% (2716/11315) Checking out files: 25% (2829/11315) Checking out files: 25% (2919/11315) Checking out files: 26% (2942/11315) Checking out files: 27% (3056/11315) Checking out files: 27% (3095/11315) Checking out files: 28% (3169/11315) Checking out files: 28% (3205/11315) Checking out files: 29% (3282/11315) Checking out files: 29% (3295/11315) Checking out files: 30% (3395/11315) Checking out files: 30% (3422/11315) Checking out files: 31% (3508/11315) Checking out files: 31% (3580/11315) Checking out files: 32% (3621/11315) Checking out files: 32% (3695/11315) Checking out files: 33% (3734/11315) Checking out files: 33% (3765/11315) Checking out files: 34% (3848/11315) Checking out files: 34% (3868/11315) Checking out files: 34% (3959/11315) Checking out files: 35% (3961/11315) Checking out files: 36% (4074/11315) Checking out files: 36% (4127/11315) Checking out files: 37% (4187/11315) Checking out files: 37% (4213/11315) Checking out files: 38% (4300/11315) Checking out files: 38% (4349/11315) Checking out files: 38% (4352/11315) Checking out files: 39% (4413/11315) Checking out files: 39% (4452/11315) Checking out files: 39% (4502/11315) Checking out files: 40% (4526/11315) Checking out files: 40% (4616/11315) Checking out files: 41% (4640/11315) Checking out files: 41% (4693/11315) Checking out files: 41% (4733/11315) Checking out files: 42% (4753/11315) Checking out files: 42% (4799/11315) Checking out files: 43% (4866/11315) Checking out files: 43% (4877/11315) Checking out files: 43% (4962/11315) Checking out files: 44% (4979/11315) Checking out files: 45% (5092/11315) Checking out files: 45% (5139/11315) Checking out files: 46% (5205/11315) Checking out files: 46% (5227/11315) Checking out files: 46% (5304/11315) Checking out files: 47% (5319/11315) Checking out files: 47% (5340/11315) Checking out files: 47% (5403/11315) Checking out files: 48% (5432/11315) Checking out files: 48% (5466/11315) Checking out files: 49% (5545/11315) Checking out files: 49% (5568/11315) Checking out files: 50% (5658/11315) Checking out files: 50% (5717/11315) Checking out files: 51% (5771/11315) Checking out files: 51% (5851/11315) Checking out files: 52% (5884/11315) Checking out files: 52% (5966/11315) Checking out files: 53% (5997/11315) Checking out files: 53% (6061/11315) Checking out files: 54% (6111/11315) Checking out files: 54% (6176/11315) Checking out files: 55% (6224/11315) Checking out files: 55% (6297/11315) Checking out files: 56% (6337/11315) Checking out files: 56% (6416/11315) Checking out files: 57% (6450/11315) Checking out files: 57% (6541/11315) Checking out files: 58% (6563/11315) Checking out files: 58% (6635/11315) Checking out files: 59% (6676/11315) Checking out files: 59% (6734/11315) Checking out files: 60% (6789/11315) Checking out files: 60% (6874/11315) Checking out files: 61% (6903/11315) Checking out files: 61% (6973/11315) Checking out files: 62% (7016/11315) Checking out files: 63% (7129/11315) Checking out files: 63% (7131/11315) Checking out files: 63% (7201/11315) Checking out files: 64% (7242/11315) Checking out files: 64% (7244/11315) Checking out files: 65% (7355/11315) Checking out files: 65% (7443/11315) Checking out files: 66% (7468/11315) Checking out files: 66% (7533/11315) Checking out files: 67% (7582/11315) Checking out files: 67% (7634/11315) Checking out files: 68% (7695/11315) Checking out files: 68% (7773/11315) Checking out files: 69% (7808/11315) Checking out files: 70% (7921/11315) Checking out files: 70% (7927/11315) Checking out files: 71% (8034/11315) Checking out files: 71% (8087/11315) Checking out files: 72% (8147/11315) Checking out files: 72% (8191/11315) Checking out files: 73% (8260/11315) Checking out files: 73% (8279/11315) Checking out files: 74% (8374/11315) Checking out files: 74% (8418/11315) Checking out files: 75% (8487/11315) Checking out files: 75% (8564/11315) Checking out files: 76% (8600/11315) Checking out files: 77% (8713/11315) Checking out files: 77% (8715/11315) Checking out files: 78% (8826/11315) Checking out files: 78% (8857/11315) Checking out files: 79% (8939/11315) Checking out files: 79% (8984/11315) Checking out files: 80% (9052/11315) Checking out files: 80% (9058/11315) Checking out files: 81% (9166/11315) Checking out files: 81% (9178/11315) Checking out files: 81% (9258/11315) Checking out files: 82% (9279/11315) Checking out files: 82% (9360/11315) Checking out files: 83% (9392/11315) Checking out files: 83% (9429/11315) Checking out files: 84% (9505/11315) Checking out files: 84% (9517/11315) Checking out files: 85% (9618/11315) Checking out files: 85% (9665/11315) Checking out files: 86% (9731/11315) Checking out files: 86% (9806/11315) Checking out files: 87% (9845/11315) Checking out files: 87% (9945/11315) Checking out files: 88% (9958/11315) Checking out files: 88% (10060/11315) Checking out files: 89% (10071/11315) Checking out files: 89% (10145/11315) Checking out files: 90% (10184/11315) Checking out files: 90% (10215/11315) Checking out files: 91% (10297/11315) Checking out files: 91% (10321/11315) Checking out files: 92% (10410/11315) Checking out files: 92% (10421/11315) Checking out files: 92% (10482/11315) Checking out files: 93% (10523/11315) Checking out files: 93% (10587/11315) Checking out files: 94% (10637/11315) Checking out files: 94% (10661/11315) Checking out files: 95% (10750/11315) Checking out files: 95% (10789/11315) Checking out files: 95% (10838/11315) Checking out files: 96% (10863/11315) Checking out files: 96% (10919/11315) Checking out files: 97% (10976/11315) Checking out files: 97% (11000/11315) Checking out files: 98% (11089/11315) Checking out files: 98% (11098/11315) Checking out files: 99% (11202/11315) Checking out files: 99% (11287/11315) Checking out files: 100% (11315/11315) Checking out files: 100% (11315/11315), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc5-stor1' From . * branch scsi-post-merge -> FETCH_HEAD