From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 1bae4ce..ec30f34 master -> origin/mast## From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 c32e061..75c65a5 master -> scsi-misc Checking out files: 27% (313/1141) Checking out files: 28% (320/1141) ChecRemoving patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c Merge made by recursive. drivers/scsi/arcmsr/arcmsr.h | 11 ++- drivers/scsi/arcmsr/arcmsr_attr.c | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 114 ++++++++++++---------------------- drivers/scsi/libsas/sas_scsi_host.c | 1 + drivers/scsi/mpt2sas/mpt2sas_base.c | 19 ++++-- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 64 +++++++++++++++---- include/scsi/scsi.h | 1 + 7 files changed, 117 insertions(+), 95 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-linus block-for-linus ## Merge made by recursive. block/blk-throttle.c | 10 +++++++++- block/cfq-iosched.c | 6 +++--- drivers/block/Makefile | 2 +- drivers/block/aoe/Makefile | 2 +- drivers/block/cciss.c | 2 +- drivers/block/loop.c | 3 +++ kernel/trace/blktrace.c | 7 +++++++ 7 files changed, 25 insertions(+), 7 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-next block-for-next ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-fixes ## Merge made by recursive. drivers/ata/ahci.c | 3 + drivers/ata/pata_hpt366.c | 6 +- drivers/ata/pata_hpt37x.c | 112 +++++++++++++++++++++----------------------- drivers/ata/pata_hpt3x2n.c | 12 ++--- drivers/ata/pata_mpc52xx.c | 2 +- 5 files changed, 66 insertions(+), 69 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Already up-to-date. ## # quilt /pub/linux/kernel/people/agk/patches/2.6/editing/ device-mapper section NEXT_PATCHES ## sending incremental file list ./ 0002-dm-log-userspace-split-flush-queue.patch 0003-dm-log-userspace-group-clear-and-mark-requests.patch 0004-dm-log-userspace-add-version-number-to-communication.patch 0005-dm-stripe-switch-from-local-workqueue-to-system_wq.patch 0006-dm-snapshot-kill-unused-dm_snapshot-queued_bios_work.patch 0007-dm-convert-to-alloc-_ordered-_workqueue.patch 0008-dm-don-t-use-flush_scheduled_work.patch 0009-dm-use-non-reentrant-workqueues-if-equivalent.patch 0010-dm-snapshot-persistent-make-metadata_wq-multithreade.patch base dm-add-flakey-target.patch dm-add-ioband.patch dm-bufio.patch dm-change-clone-bi_private-pointer-during-cleanup.patch dm-convert-workqueues-to-alloc_ordered.patch dm-crypt-add-loop-aes-iv-generator-old.patch dm-crypt-add-loop-aes-iv-generator.patch dm-crypt-add-multi-key-capability.patch dm-crypt-add-post-iv-call-to-iv-generator.patch dm-crypt-remove-unused-compatible-table-output.patch dm-crypt-scale-to-multiple-CPUs.patch dm-crypt-scale-to-multiple-cpus.patch dm-crypt-set-key-size-early.patch dm-crypt-simplify-compatible-table-output.patch dm-crypt-use-IO-thread-for-reads-only-if-mempool-is-exhausted.patch dm-crypt-use-io-thread-for-reads-only-if-mempool-exhausted.patch dm-delay-unplug-queue.patch dm-dont-take-i_mutex-to-change-device-size.patch dm-dont-use-flush_scheduled_work.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-introduce-target-callbacks-and-congestion-callback.patch dm-io-delay-queue-unplug-in-kcopyd.patch dm-io-remove-BIO_RW_SYNCIO-flag-froChecking out files: 31% (681/2156) Checking out files: 32% (690/2156) Checking out files: 33% (712/2156) Checking out files: 34% (734/2156) Checking out files: 35% (755/2156) Checking out files: 36% (777/2156) Checking out files: 37% (798/2156) Checking out files: 38% (820/2156) Checking out files: 39% (841/2156) Checking out files: 40% (863/2156) Checking out files: 41% (884/2156) Checking out files: 41% (894/2156) Checking out files: 42% (906/2156) Checking out files: 43% (928/2156) Checking out files: 44% (949/2156) Checking out files: 45% (971/2156) Checking out files: 46% (992/2156) Checking out files: 47% (1014/2156) Checking out files: 48% (1035/2156) Checking out files: 49% (1057/2156) Checking out files: 50% (1078/2156) Checking out files: 51% (1100/2156) Checking out files: 52% (1122/2156) Checking out files: 53% (1143/2156) Checking out files: 54% (1165/2156) Checking out files: 55% (1186/2156) Checking out files: 56% (1208/2156) Checking out files: 57% (1229/2156) Checking out files: 57% (1237/2156) Checking out files: 58% (1251/2156) Checking out files: 59% (1273/2156) Checking out files: 60% (1294/2156) Checking out files: 61% (1316/2156) Checking out files: 62% (1337/2156) Checking out files: 63% (1359/2156) Checking out files: 64% (1380/2156) Checking out files: 65% (1402/2156) Checking out files: 66% (1423/2156) Checking out files: 67% (1445/2156) Checking out files: 68% (1467/2156) Checking out files: 68% (1482/2156) Checking out files: 69% (1488/2156) Checking out files: 70% (1510/2156) Checking out files: 71% (1531/2156) Checking out files: 72% (1553/2156) Checking out files: 73% (1574/2156) Checking out files: 74% (1596/2156) Checking out files: 75% (1617/2156) Checking out files: 76% (1639/2156) Checking out files: 77% (1661/2156) Checking out files: 78% (1682/2156) Checking out files: 79% (1704/2156) Checking out files: 79% (1724/2156) Checking out files: 80% (1725/2156) Checking out files: 81% (1747/2156) Checking out files: 82% (1768/2156) Checking out files: 83% (1790/2156) Checking out files: 84% (1812/2156) Checking out files: 85% (1833/2156) Checking out files: 86% (1855/2156) Checking out files: 87% (1876/2156) Checking out files: 88% (1898/2156) Checking out files: 89% (1919/2156) Checking out files: 90% (1941/2156) Checking out files: 91% (1962/2156) Checking out files: 91% (1971/2156) Checking out files: 92% (1984/2156) Checking out files: 93% (2006/2156) Checking out files: 94% (2027/2156) Checking out files: 95% (2049/2156) Checking out files: 96% (2070/2156) Checking out files: 97% (2092/2156) Checking out files: 98% (2113/2156) Checking out files: 99% (2135/2156) Checking out files: 100% (2156/2156) Checking out files: 100% (2156/2156), done. Switched to branch 'device-mapper' Checking out files: 32% (702/2156) Checking out files: 33% (712/2156) Checking out files: 34% (734/2156) Checking out files: 35% (755/2156) Checking out files: 36% (777/2156) Checking out files: 37% (798/2156) Checking out files: 38% (820/2156) Checking out files: 39% (841/2156) Checking out files: 40% ## # 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.38-rc2-stor1. Already up-to-date. ## # check ## No prior to diff against ## # label ## [2.6.38-rc2-stor1 1458163] 2.6.38-rc2-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- ## t files: 64% (1380/2156) Checking out files: 65% (1402/2156) Checking out files: 66% (1423/2156) Checking out files: 67% (1445/2156) Checking out files: 68% (1467/2156) Checking out files: 69% (1488/2156) Checking out files: 70% (1510/2156) Checking out files: 71% (1531/2156) Checking out files: 72% (1553/2156) Checking out files: 73% (1574/2156) Checking out files: 74% (1596/2156) Checking out files: 75% (1617/2156) Checking out files: 76% (1639/2156) Checking out files: 77% (1661/2156) Checking out files: 77% (1668/2156) Checking out files: 78% (1682/2156) Checking out files: 79% (1704/2156) Checking out files: 80% (1725/2156) Checking out files: 81% (1747/2156) Checking out files: 82% (1768/2156) Checking out files: 83% (1790/2156) Checking out files: 84% (1812/2156) Checking out files: 85% (1833/2156) Checking out files: 86% (1855/2156) Checking out files: 87% (1876/2156) Checking out files: 88% (1898/2156) Checking out files: 89% (1919/2156) Checking out files: 89% (1923/2156) Checking out files: 90% (1941/2156) Checking out files: 91% (1962/2156) Checking out files: 92% (1984/2156) Checking out files: 93% (2006/2156) Checking out files: 94% (2027/2156) Checking out files: 95% (2049/2156) Checking out files: 96% (2070/2156) Checking out files: 97% (2092/2156) Checking out files: 98% (2113/2156) Checking out files: 99% (2135/2156) Checking out files: 100% (2156/2156) Checking out files: 100% (2156/2156), done. Switched to branch '2.6.38-rc2-stor1' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 4f9662b...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 32% (683/2110) Checking out files: 33% (697/2110) Checking out files: 34% (718/2110) Checking out files: 35% (739/2110) Checking out files: 36% (760/2110) Checking out files: 37% (781/2110) Checking out files: 38% (802/2110) Checking out files: 39% (823/2110) Checking out files: 40% (844/2110) Checking out files: 41% (866/2110) Checking out files: 42% (887/2110) Checking out files: 42% (906/2110) Checking out files: 43% (908/2110) Checking out files: 44% (929/2110) Checking out files: 45% (950/2110) Checking out files: 46% (971/2110) Checking out files: 47% (992/2110) Checking out files: 48% (1013/2110) Checking out files: 49% (1034/2110) Checking out files: 50% (1055/2110) Checking out files: 51% (1077/2110) Checking out files: 52% (1098/2110) Checking out files: 53% (1119/2110) Checking out files: 54% (1140/2110) Checking out files: 55% (1161/2110) Checking out files: 56% (1182/2110) Checking out files: 57% (1203/2110) Checking out files: 58% (1224/2110) Checking out files: 59% (1245/2110) Checking out files: 60% (1266/2110) Checking out files: 61% (1288/2110) Checking out files: 62% (1309/2110) Checking out files: 63% (1330/2110) Checking out files: 64% (1351/2110) Checking out files: 65% (1372/2110) Checking out files: 66% (1393/2110) Checking out files: 67% (1414/2110) Checking out files: 67% (1426/2110) Checking out files: 68% (1435/2110) Checking out files: 69% (1456/2110) Checking out files: 70% (1477/2110) Checking out files: 71% (1499/2110) Checking out files: 72% (1520/2110) Checking out files: 73% (1541/2110) Checking out files: 74% (1562/2110) Checking out files: 75% (1583/2110) Checking out files: 76% (1604/2110) Checking out files: 77% (1625/2110) Checking out files: 78% (1646/2110) Checking out files: 79% (1667/2110) Checking out files: 79% (1674/2110) Checking out files: 80% (1688/2110) Checking out files: 81% (1710/2110) Checking out files: 82% (1731/2110) Checking out files: 83% (1752/2110) Checking out files: 84% (1773/2110) Checking out files: 85% (1794/2110) Checking out files: 86% (1815/2110) Checking out files: 87% (1836/2110) Checking out files: 88% (1857/2110) Checking out files: 89% (1878/2110) Checking out files: 90% (1899/2110) Checking out files: 91% (1921/2110) Checking out files: 91% (1928/2110) Checking out files: 92% (1942/2110) Checking out files: 93% (1963/2110) Checking out files: 94% (1984/2110) Checking out files: 95% (2005/2110) Checking out files: 96% (2026/2110) Checking out files: 97% (2047/2110) Checking out files: 98% (2068/2110) Checking out files: 99% (2089/2110) Checking out files: 100% (2110/2110) Checking out files: 100% (2110/2110), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.38-rc2-stor1' From . * branch scsi-post-merge -> FETCH_HEAD