From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 6663050..6fb1b30 master -> origin/mas## #Checking out files: 10% (12/112) Checking out files: 11% (13/112) Checking out files: 12% (14/112) Checking out files: 13% (15/112) Checking out files: 14% (16Removing 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 +- block/elevator.c | 7 + drivers/char/agp/intel-gtt.c | 19 +- drivers/clocksource/acpi_pm.c | 6 +- drivers/gpu/drm/Kconfig | 3 + drivers/gpu/drm/i915/i915_dma.c | 35 +-- drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_gem.c | 12 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 + drivers/gpu/drm/i915/i915_irq.c | 37 ++- drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/intel_display.c | 25 ++- drivers/gpu/drm/i915/intel_opregion.c | 3 +- drivers/gpu/drm/i915/intel_ringbuffer.c |From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 12% (284/2225) Checking out files: 13% (290/2225) Checking out files: 14% (312/2225) Checking out files: 15% (334/2225) Checking out files: 15% (344/2225) Checking out files: 16% (356/2225) Checking out files: 17% (379/2225) Checking out files: 17% (390/2225) Checking out files: 18% (401/2225) Checking out files: 19% (423/2225) Checking out files: 19% (444/2225) Checking out files: 20% (445/2225) Checking out files: 21% (468/2225) Checking out files: 21% (484/2225) Checking out files: 22% (490/2225) Checking out files: 23% (512/2225) Checking out files: 24% (534/2225) Checking out files: 24% (537/2225) Checking out files: 25% (557/2225) Checking out files: 26% (579/2225) Checking out files: 27% (601/2225) Checking out files: 28% (623/2225) Checking out files: 29% (646/2225) Checking out files: 29% (652/2225) Checking out files: 30% (668/2225) Checking out files: 31% (690/2225) Checking out files: 32% (712/2225) Checking out files: 32% (720/2225) Checking out files: 33% (735/2225) Checking out files: 33% (753/2225) Checking out files: 34% (757/2225) Checking out files: 35% (779/2225) Checking out files: 35% (794/2225) Checking out files: 36% (801/2225) Checking out files: 37% (824/2225) Checking out files: 38% (846/2225) Checking out files: 38% (860/2225) Checking out files: 39% (868/2225) Checking out files: 40% (890/2225) Checking out files: 41% (913/2225) Checking out files: 42% (935/2225) Checking out files: 43% (957/2225) Checking out files: 44% (979/2225) Checking out files: 44% (980/2225) Checking out files: 45% (1002/2225) Checking out files: 46% (1024/2225) Checking out files: 47% (1046/2225) Checking out files: 48% (1068/2225) Checking out files: 49% (1091/2225) Checking out files: 50% (1113/2225) Checking out files: 51% (1135/2225) Checking out files: 52% (1157/2225) Checking out files: 53% (1180/2225) Checking out files: 54% (1202/2225) Checking out files: 54% (1213/2225) Checking out files: 55% (1224/2225) Checking out files: 56% (1246/2225) Checking out files: 57% (1269/2225) Checking out files: 58% (1291/2225) Checking out files: 59% (1313/2225) Checking out files: 60% (1335/2225) Checking out files: 61% (1358/2225) Checking out files: 62% (1380/2225) Checking out files: 62% (1396/2225) Checking out files: 63% (1402/2225) Checking out files: 64% (1424/2225) Checking out files: 65% (1447/2225) Checking out files: 66% (1469/2225) Checking out files: 67% (1491/2225) Checking out files: 67% (1494/2225) Checking out files: 68% (1513/2225) Checking out files: 69% (1536/2225) Checking out files: 69% (1540/2225) Checking out files: 70% (1558/2225) Checking out files: 71% (1580/2225) Checking out files: 72% (1602/2225) Checking out files: 72% (1612/2225) Checking out files: 73% (1625/2225) Checking out files: 74% (1647/2225) Checking out files: 75% (1669/2225) Checking out files: 76% (1691/2225) Checking out files: 77% (1714/2225) Checking out files: 78% (1736/2225) Checking out files: 79% (1758/2225) Checking out files: 79% (1764/2225) Checking out files: 80% (1780/2225) Checking out files: 81% (1803/2225) Checking out files: 82% (1825/2225) Checking out files: 83% (1847/2225) Checking out files: 83% (1853/2225) Checking out files: 84% (1869/2225) Checking out files: 85% (1892/2225) Checking out files: 85% (1900/2225) Checking out files: 86% (1914/2225) Checking out files: 87% (1936/2225) Checking out files: 88% (1958/2225) Checking out files: 89% (1981/2225) Checking out files: 89% (1993/2225) Checking out files: 90% (2003/2225) Checking out files: 91% (2025/2225) Checking out files: 92% (2047/2225) Checking out files: 92% (2065/2225) Checking out files: 93% (2070/2225) Checking out files: 94% (2092/2225) Checking out files: 95% (2114/2225) Checking out files: 95% (2126/2225) Checking out files: 96% (2136/2225) Checking out files: 97% (2159/2225) Checking out files: 98% (2181/2225) Checking out files: 99% (2203/2225) Checking out files: 99% (2208/2225) Checking out files: 100% (2225/2225) Checking out files: 100% (2225/2225), done. Switched to branch 'device-mapper' Checking out files: 11% (249/2225) Checking out files: 12% (267/2225) Checking out files: 13% (290/2225) Checking out files: 14% (312/2225) Checking out files: 15% (334/2225) Checking out files: 16% (356/2225) Checking out files: 17% (379/2225) Checking out files: 18% (401/2225) Checking out files: 19% (423/2225) Checking out files: 20% (445/2225) Checking out files: 20% (447/2225) Checking out files: 21% (468/2225) Checking out files: 22% (490/2225) Checking out files: 23% (512/2225) Checking out files: 24% (534/2225) Checking out files: 25% (557/2225) Checking out files: 26% (579/2225) Checking out files: 26% (580/2225) Checking out files: 27% (601/2225) Checking out files: 28% (623/2225) Checking out files: 29% (646/2225) Checking out files: 30% (668/2225) Checking out files: 30% (686/2225) Checking out files: 31% (690/2225) Checking out files: 32% (712/2225) Checking out files: 33% (735/2225) Checking out files: 34% (757/2225) Checking out files: 35% (779/2225) Checking out files: 36% (801/2225) Checking out files: 37% (824/2225) Checking out files: 37% (834/2225) Checking out files: 38% (846/2225) Checking out files: 39% (868/2225) Checking out files: 40% (890/2225) Checking out files: 41% (913/2225) Checking out files: 42% (935/2225) Checking out files: 43% (957/2225) Checking out files: 44% (979/2225) Checking out files: 45% (1002/2225) Checking out files: 46% (1024/2225) Checking out files: 46% (1028/2225) Checking out files: 47% (1046/2225) Checking out files: 48% (1068/2225) Checking out files: 49% (1091/2225) Checking out files: 49% (1112/2225) Checking out files: 50% (1113/2225) Checking out files: 51% (1135/2225) Checking out files: 52% (1157/2225) Checking out files: 53% (1180/2225) Checking out files: 54% (1202/2225) Checking out files: 55% (1224/2225) Checking out files: 56% (1246/2225) Checking out files: 57% (1269/2225) Checking out files: 58% (1291/2225) Checking out files: 58% (1296/2225) Checking out files: 59% (1313/2225) Checking out files: 59% (1318/2225) Checking out files: 60% (1335/2225) Checking out files: 61% (1358/2225) Checking out files: 62% (1380/2225) Checking out files: 63% (1402/2225) Checking out files: 63% (1419/2225) Checking out files: 64% (1424/2225) Checking out files: 65% (1447/2225) Checking out files: 66% (1469/2225) Checking out files: 66% (1486/2225) Checking out files: 67% (1491/2225) Checking out files: 68% (1513/2225) Checking out files: 68% (1524/2225) Checking out files: 69% (1536/2225) Checking out files: 70% (1558/2225) Checking out files: 71% (1580/2225) Checking out files: 71% (1582/2225) Checking out files: 72% (1602/2225) Checking out files: 73% (1625/2225) Checking out files: 73% (1626/2225) Checking out files: 74% (1647/2225) Checking out files: 75% (1669/2225) Checking out files: 76% (1691/2225) Checking out files: 77% (1714/2225) Checking out files: 78% (1736/2225) Checking out files: 79% (1758/2225) Checking out files: 80% (1780/2225) Checking out files: 80% (1790/2225) Checking out files: 81% (1803/2225) Checking out files: 82% (1825/2225) Checking out files: 83% (1847/2225) Checking out files: 84% (1869/2225) Checking out files: 85% (1892/2225) Checking out files: 85% (1893/2225) Checking out files: 86% (1914/2225) Checking out files: 87% (1936/2225) Checking out files: 88% (1958/2225) Checking out files: 88% (1974/2225) Checking out files: 89% (1981/2225) Checking out files: 90% (2003/2225) Checking out files: 91% (2025/2225) Checking out files: 92% (204## # 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-stor3. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.38-rc2-stor3 89c9b9a] 2.6.38-rc2-stor3 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- ## s: 30% (654/2179) Checking out files: 31% (676/2179) Checking out files: 32% (698/2179) Checking out files: 33% (720/2179) Checking out files: 34% (741/2179) Checking out files: 35% (763/2179) Checking out files: 36% (785/2179) Checking out files: 37% (807/2179) Checking out files: 38% (829/2179) Checking out files: 39% (850/2179) Checking out files: 40% (872/2179) Checking out files: 40% (887/2179) Checking out files: 41% (894/2179) Checking out files: 42% (916/2179) Checking out files: 43% (937/2179) Checking out files: 44% (959/2179) Checking out files: 45% (981/2179) Checking out files: 46% (1003/2179) Checking out files: 47% (1025/2179) Checking out files: 47% (1039/2179) Checking out files: 48% (1046/2179) Checking out files: 49% (1068/2179) Checking out files: 50% (1090/2179) Checking out files: 51% (1112/2179) Checking out files: 52% (1134/2179) Checking out files: 53% (1155/2179) Checking out files: 53% (1156/2179) Checking out files: 54% (1177/2179) Checking out files: 55% (1199/2179) Checking out files: 56% (1221/2179) Checking out files: 57% (1243/2179) Checking out files: 58% (1264/2179) Checking out files: 59% (1286/2179) Checking out files: 60% (1308/2179) Checking out files: 61% (1330/2179) Checking out files: 61% (1343/2179) Checking out files: 62% (1351/2179) Checking out files: 63% (1373/2179) Checking out files: 64% (1395/2179) Checking out files: 65% (1417/2179) Checking out files: 66% (1439/2179) Checking out files: 67% (1460/2179) Checking out files: 68% (1482/2179) Checking out files: 69% (1504/2179) Checking out files: 70% (1526/2179) Checking out files: 71% (1548/2179) Checking out files: 71% (1566/2179) Checking out files: 72% (1569/2179) Checking out files: 73% (1591/2179) Checking out files: 74% (1613/2179) Checking out files: 75% (1635/2179) Checking out files: 76% (1657/2179) Checking out files: 77% (1678/2179) Checking out files: 78% (1700/2179) Checking out files: 79% (1722/2179) Checking out files: 80% (1744/2179) Checking out files: 81% (1765/2179) Checking out files: 82% (1787/2179) Checking out files: 83% (1809/2179) Checking out files: 84% (1831/2179) Checking out files: 85% (1853/2179) Checking out files: 86% (1874/2179) Checking out files: 87% (1896/2179) Checking out files: 88% (1918/2179) Checking out files: 89% (1940/2179) Checking out files: 90% (1962/2179) Checking out files: 90% (1968/2179) Checking out files: 91% (1983/2179) Checking out files: 92% (2005/2179) Checking out files: 93% (2027/2179) Checking out files: 93% (2033/2179) Checking out files: 94% (2049/2179) Checking out files: 95% (2071/2179) Checking out files: 96% (2092/2179) Checking out files: 97% (2114/2179) Checking out files: 98% (2136/2179) Checking out files: 99% (2158/2179) Checking out files: 100% (2179/2179) Checking out files: 100% (2179/2179), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.38-rc2-stor3' From . * branch scsi-post-merge -> FETCH_HEAD