From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 831d52b..44f2c5c master -> origin/mast## Checking out files: 33% (38/114) Checking out files: 34% (39/114) Checking out files: 35% (40/114) Checking out files: 36% (42/114) Checking out files: 37% (43/1Removing 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 ## Merge made by recursive. arch/arm/mach-omap1/Kconfig | 2 + arch/arm/mach-omap1/Makefile | 3 +- arch/arm/mach-omap1/time.c | 101 ++++++- arch/arm/mach-omap1/timer32k.c | 13 +- arch/arm/mach-omap2/board-cm-t3517.c | 29 ++- arch/arm/mach-omap2/board-devkit8000.c | 3 +- arch/arm/mach-omap2/clock44xx_data.c | 1 - arch/arm/mach-omap2/clockdomain.c | 30 ++- arch/arm/mach-omap2/clockdomains44xx_data.c | 2 - arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 1 - arch/arm/mach-omap2/timer-gp.c | 10 +- arch/arm/plat-omap/Kconfig | 8 +- arch/arm/plat-omap/counter_32k.c | 22 +- arch/arm/plat-omap/dma.c | 7 +- arch/arm/plat-omap/include/plat/common.h | 3 + arch/powerpc/kernel/perf_event_fsl_emb.c | 1 + arch/x86/include/asm/cacheflush.h | 42 +--- arch/x86/include/asm/cpu.h | 1 + arch/x86/include/asm/jump_label.h | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 3 + arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 + arch/x86/kernel/process.c | 3 +- arch/x86/kernel/smpboot.c | 3 +- block/blk-core.c | 56 ++-- block/blk-flush.c | 441 ++++++++++++++++++-------- block/blk.h | 12 +- bFrom . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 36% (809/2227) Checking out files: 37% (824/2227) Checking out files: 38% (847/2227) Checking out files: 39% (869/2227) Checking out files: 40% (891/2227) Checking out files: 41% (914/2227) Checking out files: 42% (936/2227) Checking out files: 43% (958/2227) Checking out files: 44% (980/2227) Checking out files: 45% (1003/2227) Checking out files: 46% (1025/2227) Checking out files: 47% (1047/2227) Checking out files: 48% (1069/2227) Checking out files: 49% (1092/2227) Checking out files: 50% (1114/2227) Checking out files: 51% (1136/2227) Checking out files: 52% (1159/2227) Checking out files: 53% (1181/2227) Checking out files: 54% (1203/2227) Checking out files: 55% (1225/2227) Checking out files: 55% (1227/2227) Checking out files: 56% (1248/2227) Checking out files: 57% (1270/2227) Checking out files: 58% (1292/2227) Checking out files: 59% (1314/2227) Checking out files: 60% (1337/2227) Checking out files: 61% (1359/2227) Checking out files: 62% (1381/2227) Checking out files: 63% (1404/2227) Checking out files: 64% (1426/2227) Checking out files: 65% (1448/2227) Checking out files: 66% (1470/2227) Checking out files: 67% (1493/2227) Checking out files: 68% (1515/2227) Checking out files: 69% (1537/2227) Checking out files: 69% (1541/2227) Checking out files: 70% (1559/2227) Checking out files: 71% (1582/2227) Checking out files: 72% (1604/2227) Checking out files: 73% (1626/2227) Checking out files: 74% (1648/2227) Checking out files: 75% (1671/2227) Checking out files: 76% (1693/2227) Checking out files: 77% (1715/2227) Checking out files: 78% (1738/2227) Checking out files: 79% (1760/2227) Checking out files: 80% (1782/2227) Checking out files: 81% (1804/2227) Checking out files: 82% (1827/2227) Checking out files: 83% (1849/2227) Checking out files: 84% (1871/2227) Checking out files: 85% (1893/2227) Checking out files: 85% (1895/2227) Checking out files: 86% (1916/2227) Checking out files: 87% (1938/2227) Checking out files: 88% (1960/2227) Checking out files: 89% (1983/2227) Checking out files: 90% (2005/2227) Checking out files: 91% (2027/2227) Checking out files: 92% (2049/2227) Checking out files: 93% (2072/2227) Checking out files: 94% (2094/2227) Checking out files: 95% (2116/2227) Checking out files: 96% (2138/2227) Checking out files: 96% (2151/2227) Checking out files: 97% (2161/2227) Checking out files: 98% (2183/2227) Checking out files: 99% (2205/2227) Checking out files: 100% (2227/2227) Checking out files: 100% (2227/2227), done. Switched to branch 'device-mapper' Checking out files: 33% (740/2227) Checking out files: 34% (758/2227) Checking out files: 35% (780/2227) Checking out files: 36% (802/2227) Checking out files: 37% (824/2227) Checking out files: 38% (847/2227) Checking out files: 39% (869/2227) Checking out files: 40% (891/2227) Checking out files: 41% (914/2227) Checking out files: 42% (936/2227) Checking out files: 43% (958/2227) Checking out files: 44% (980/2227) Checking out files: 45% (1003/2227) Checking out files: 46% (1025/2227) Checking out files: 47% (1047/2227) Checking out files: 48% (1069/2227) Checking out files: 49% (1092/2227) Checking out files: 50% (1114/2227) Checking out files: 51% (1136/2227) Checking out files: 52% (1159/2227) Checking out files: 53% (1181/2227) Checking out files: 53% (1199/2227) Checking out files: 54% (1203/2227) Checking out files: 55% (1225/2227) Checking out files: 56% (1248/2227) Checking out files: 57% (1270/2227) Checking out files: 58% (1292/2227) Checking out files: 59% (1314/2227) Checking out files: 60% (1337/2227) Checking out files: 61% (1359/2227) Checking out files: 62% (1381/2227) Checking out files: 63% (1404/2227) Checking out files: 64% (1426/2227) Checking out files: 65% (1448/2227) Checking out files: 66% (1470/2227) Checking out files: 67% (1493/2227) Checking out files: 67% (1507/2227) Checking out files: 68% (1515/2227) Checking out files: 69% (1537/2227) Checking out files: 70% (1559/2227) Checking out files: 71% (1582/2227) Checking out files: 72% (1604/2227) Checking out files: 73% (1626/2227) Checking out files: 74% (1648/2227) Checking out files: 75% (1671/2227) Checking out files: 76% (1693/2227) Checking out files: 77% (1715/2227) Checking out files: 78% (1738/2227) Checking out files: 79% (1760/2227) Checking out files: 80% (1782/2227) Checking out files: 81% (1804/2227) Checking out files: 81% (1813/2227) Checking out files: 82% (1827/2227) Checking out files: 83% (1849/2227) Checking out files: 84% (1871/2227) Checking out files: 85% (1893/2227) Checking out files: 86% (1916/2227) Checking out files: 87% (1938/2227) Checking out files: 88% (1960/2227) Checking out files: 89% (1983/2227) Checking out files: 90% (2005/2227) Checking out files: 91% (2027/2227) Checking out files: 92% (2049/2227) Checking out files: 93% (2072/2227) Checking out files: 93% (2082/2227) Checking out files: 94% (2094/2227) Checking out files: 95% (2116/2227) Checking out files: 96% (2138/2227) Checking out files: 97% (2161/2227) Checking out files: 98% (2183/2227) Checking out files: 99% (2205/2227) Checking out files: 100% (2227/2227) Checking out files: 100% (2227/2227), done. Switched to branch '2.6.38-rc2-stor12' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + e86429c...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 36% (796/2181) Checking out files: 37% (807/2181) Checking out files: 38% (829/2181) Checking out files: 39% (851/2181) Checking out files: 40% (873/2181) Checking out files: 41% (895/2181) Checking out files: 42% (917/2181) Checking out files: 43% (938/2181) Checking out files: 44% (960/2181) Checking out files: 45% (982/2181) Checking out files: 46% (1004/2181) Checking out files: 47% (1026/2181) Checking out files: 48% (1047/2181) Checking out files: 49% (1069/2181) Checking out files: 50% (1091/2181) Checking out files: 51% (1113/2181) Checking out files: 52% (1135/2181) Checking out files: 53% (1156/2181) Checking out files: 54% (1178/2181) Checking out files: 55% (1200/2181) Checking out files: 56% (1222/2181) Checking out files: 57% (1244/2181) Checking out files: 57% (1256/2181) Checking out files: 58% (1265/2181) Checking out files: 59% (1287/2181) Checking out files: 60% (1309/2181) Checking out files: 61% (1331/2181) Checking out files: 62% (1353/2181) Checking out files: 63% (1375/2181) Checking out files: 64% (1396/2181) Checking out files: 65% (1418/2181) Checking out files: 66% (1440/2181) Checking out files: 67% (1462/2181) Checking out files: 68% (1484/2181) Checking out files: 69% (1505/2181) Checking out files: 70% (1527/2181) Checking out files: 71% (1549/2181) Checking out files: 71% (1560/2181) Checking out files: 72% (1571/2181) Checking out files: 73% (1593/2181) Checking out files: 74% (1614/2181) Checking out files: 75% (1636/2181) Checking out files: 76% (1658/2181) Checking out files: 77% (1680/2181) Checking out files: 78% (1702/2181) Checking out files: 79% (1723/2181) Checking out files: 80% (1745/2181) Checking out files: 81% (1767/2181) Checking out files: 82% (1789/2181) Checking out files: 83% (1811/2181) Checking out files: 84% (1833/2181) Checking out files: 85% (1854/2181) Checking out files: 85% (1874/2181) Checking out files: 86% (1876/2181) Checking out files: 87% (1898/2181) Checking out files: 88% (1920/2181) Checking out files: 89% (1942/2181) Checking out files: 90% (1963/2181) Checking out files: 91% (1985/2181) Checking out files: 92% (2007/2181) Checking out files: 93% (2029/2181) Checking out files: 94% (2051/2181) Checking out files: 95% (2072/2181) Checking out files: 96% (2094/2181) Checking out files: 97% (2116/2181) Checking out files: 98% (2138/2181) Checking out files: 99% (2160/2181) Checking out files: 99% (2161/2181) Checking out files: 100% (2181/2181) Checking out files: 100% (2181/2181), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.38-rc2-stor12' From . * branch scsi-post-merge -> FETCH_HEAD -userspace.patch end git-2636rc1-2637rc4.patch git-update1.patch git-update2.patch git-update3.patch git-update4.patch git-update5.patch git-update6.patch git-update7.patch mm next next-20101013.patch series series.html uml-fixes.patch v6-1-4-dm-replicator-documentation-and-module-registry.patch v6-2-4-dm-replicator-replication-log-and-site-link-handler-interfaces-and-main-replicator-module.patch v6-3-4-dm-replicator-ringbuffer-replication-log-handler.patch v6-4-4-dm-replicator-blockdev-site-link-handler.patch sent 171555359 bytes received 2428 bytes 22874371.60 bytes/sec total size is 171521494 speedup is 1.00 Using base v2.6.37-7185-g52cfd50 ## # 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-stor12. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.38-rc2-stor12 9796374] 2.6.38-rc2-stor12 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- ##