From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 96fd2d5..2f666bc master -> origin/mas## # errors /pub/linux/kernel/people/jejb/storage-trChecking out files: 36% (45/125) Checking out files: 37% (47/125) Checking out files: 38% (48/125) Checking out fileRemoving 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 ## Merge made by recursive. arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/core_mcpcia.c | 12 +- arch/alpha/kernel/err_titan.c | 4 +- arch/alpha/kernel/irq_alpha.c | 2 +- arch/alpha/kernel/setup.c | 6 +- arch/alpha/kernel/smc37c93x.c | 3 +- arch/alpha/kernel/sys_wildfire.c | 5 +- arch/alpha/kernel/time.c | 1 + arch/arm/Kconfig | 3 +- arch/arm/Kconfig.debug | 11 -- arch/arm/common/Makefile | 1 - arch/arm/include/asm/thread_notify.h | 1 + arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/elf.c | 17 ++- arch/arm/kernel/hw_breakpoint.c | 7 + arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/process.c | 2 + arch/arm/kernel/traps.c | 3 +- arch/arm/mach-mmp/include/mach/gpio.h | 2 +- arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 9 + arch/arm/mach-pxa/include/mach/gpio.h | 17 ++- arch/arm/mach-pxa/include/mach/irqs.h | 3 - arch/arm/mach-pxa/pxa25x.c | 2 +- arch/arm/mach-pxa/pxa27x.c | 2 +- arch/arm/mach-tegra/gpio.c | 6 +- arch/arm/mach-tegra/tegra2_clocks.c | 9 +- arch/arm/mm/mmap.c | 4 +- arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm926.S | 2 +- arch/arm/mm/proc-sa1100.S | 2 +- arch/arm/mm/proc-v6.S | 2 +- arch/arm/mm/proc-v7.S | 2 +- arch/arm/mm/proc-xsc3.S | 2 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/plat-s5p/pm.c | 11 -- arch/arm/plat-samsung/pm-check.c | 6 - arch/arm/plat-samsung/pm.c | 5 +- arch/arm/vfp/vfpmodule.c | 34 ++++- arch/microblaze/Kconfig | 1 - arch/x86/include/asm/msr-index.h | 4 + arch/x86/kernel/cpu/amd.c | 19 +++ arch/x86/kernel/smpboot.c | 23 +++ arch/x86/platform/ce4100/falconfalls.dts | From . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 24% (2656/11038) Checking out files: 25% (2760/11038) Checking out files: 26% (2870/11038) Checking out files: 27% (2981/11038) Checking out files: 28% (3091/11038) Checking out files: 28% (3154/11038) Checking out files: 29% (3202/11038) Checking out files: 30% (3312/11038) Checking out files: 31% (3422/11038) Checking out files: 31% (3474/11038) Checking out files: 32% (3533/11038) Checking out files: 33% (3643/11038) Checking out files: 34% (3753/11038) Checking out files: 34% (3809/11038) Checking out files: 35% (3864/11038) Checking out files: 36% (3974/11038) Checking out files: 37% (4085/11038) Checking out files: 38% (4195/11038) Checking out files: 38% (4302/11038) Checking out files: 39% (4305/11038) Checking out files: 40% (4416/11038) Checking out files: 41% (4526/11038) Checking out files: 42% (4636/11038) Checking out files: 43% (4747/11038) Checking out files: 43% (4850/11038) Checking out files: 44% (4857/11038) Checking out files: 45% (4968/11038) Checking out files: 46% (5078/11038) Checking out files: 46% (5184/11038) Checking out files: 47% (5188/11038) Checking out files: 48% (5299/11038) Checking out files: 49% (5409/11038) Checking out files: 49% (5518/11038) Checking out files: 50% (5519/11038) Checking out files: 51% (5630/11038) Checking out files: 52% (5740/11038) Checking out files: 53% (5851/11038) Checking out files: 53% (5853/11038) Checking out files: 54% (5961/11038) Checking out files: 55% (6071/11038) Checking out files: 55% (6125/11038) Checking out files: 56% (6182/11038) Checking out files: 57% (6292/11038) Checking out files: 58% (6403/11038) Checking out files: 58% (6453/11038) Checking out files: 59% (6513/11038) Checking out files: 60% (6623/11038) Checking out files: 61% (6734/11038) Checking out files: 61% (6768/11038) Checking out files: 62% (6844/11038) Checking out files: 63% (6954/11038) Checking out files: 63% (7046/11038) Checking out files: 64% (7065/11038) Checking out files: 65% (7175/11038) Checking out files: 66% (7286/11038) Checking out files: 67% (7396/11038) Checking out files: 67% (7436/11038) Checking out files: 68% (7506/11038) Checking out files: 69% (7617/11038) Checking out files: 70% (7727/11038) Checking out files: 70% (7835/11038) Checking out files: 71% (7837/11038) Checking out files: 72% (7948/11038) Checking out files: 73% (8058/11038) Checking out files: 73% (8136/11038) Checking out files: 74% (8169/11038) Checking out files: 75% (8279/11038) Checking out files: 76% (8389/11038) Checking out files: 76% (8484/11038) Checking out files: 77% (8500/11038) Checking out files: 78% (8610/11038) Checking out files: 79% (8721/11038) Checking out files: 79% (8769/11038) Checking out files: 80% (8831/11038) Checking out files: 81% (8941/11038) Checking out files: 82% (9052/11038) Checking out files: 82% (9098/11038) Checking out files: 83% (9162/11038) Checking out files: 84% (9272/11038) Checking out files: 85% (9383/11038) Checking out files: 86% (9493/11038) Checking out files: 87% (9604/11038) Checking out files: 87% (9659/11038) Checking out files: 88% (9714/11038) Checking out files: 89% (9824/11038) Checking out files: 90% (9935/11038) Checking out files: 90% (9956/11038) Checking out files: 91% (10045/11038) Checking out files: 92% (10155/11038) Checking out files: 93% (10266/11038) Checking out files: 93% (10283/11038) Checking out files: 94% (10376/11038) Checking out files: 95% (10487/11038) Checking out files: 95% (10579/11038) Checking out files: 96% (10597/11038) Checking out files: 97% (10707/11038) Checking out files: 98% (10818/11038) Checking out files: 98% (10841/11038) Checking out files: 99% (10928/11038) Checking out files: 100% (11038/11038) Checking out files: 100% (11038/11038), done. Switched to branch 'device-mapper' Checking out files: 14% (1655/11038) Checking out files: 15% (1656/11038) Checking out files: 16% (1767/11038) Checking out files: 17% (1877/11038) Checking out files: 18% (1987/11038) Checking out files: 19% (2098/11038) Checking out files: 20% (2208/11038) Checking out files: 20% (2254/11038) Checking out files: 21% (2318/11038) Checking out files: 22% (2429/11038) Checking out files: 23% (2539/11038) Checking out files: 24% (2650/11038) Checking out files: 24% (2683/11038) Checking out files: 25% (2760/11038) Checking out files: 26% (2870/11038) Checking out files: 27% (2981/11038) Checking out files: 28% (3091/11038) Checking out files: 28% (3093/11038) Checking out files: 29% (3202/11038) Checking out files: 30% (3312/11038) Checking out files: 31% (3422/11038) Checking out files: 31% (3481/11038) Checking out files: 32% (3533/11038) Checking out files: 33% (3643/11038) Checking out files: 34% (3753/11038) Checking out files: 35% (3864/11038) Checking out files: 36% (3974/11038) Checking out files: 36% (4001/11038) Checking out files: 37% (4085/11038) Checking out files: 38% (4195/11038) Checking out files: 38% (4233/11038) Checking out files: 39% (4305/11038) Checking out files: 40% (4416/11038) Checking out files: 40% (4422/11038) Checking out files: 41% (4526/11038) Checking out files: 41% (4587/11038) Checking out files: 42% (4636/11038) Checking out files: 43% (4747/11038) Checking out files: 43% (4780/11038) Checking out files: 44% (4857/11038) Checking out files: 44% (4959/11038) Checking out files: 45% (4968/11038) Checking out files: 46% (5078/11038) Checking out files: 46% (5159/11038) Checking out files: 47% (5188/11038) Checking out files: 48% (5299/11038) Checking out files: 48% (5394/11038) Checking out files: 49% (5409/11038) Checking out files: 50% (5519/11038) Checking out files: 51% (5630/11038) Checking out files: 51% (5696/11038) Checking out files: 52% (5740/11038) Checking out files: 53% (5851/11038) Checking out files: 54% (5961/11038) Checking out files: 54% (6024/11038) Checking out files: 55% (6071/11038) Checking out files: 56% (6182/11038) Checking out files: 57% (6292/11038) Checking out files: 58% (6403/11038) Checking out files: 58% (6410/11038) Checking out files: 59% (6513/11038) Checking out files: 60% (6623/11038) Checking out files: 60% (6704/11038) Checking out files: 61% (6734/11038) Checking out files: 62% (6844/11038) Checking out files: 63% (6954/11038) Checking out files: 63% (6967/11038) Checking out files: 64% (7065/11038) Checking out files: 65% (7175/11038) Checking out files: 66% (7286/11038) Checking out files: 67% (7396/11038) Checking out files: 67% (7467/11038) Checking out files: 68% (7506/11038) Checking out files: 69% (7617/11038) ## # 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.39-rc3-stor5. Already up-to-date. ## # check ## Differences exist, continuing ## # label ## [2.6.39-rc3-stor5 b696c42] 2.6.39-rc3-stor5 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- ## es: 85% (9383/11038) Checking out files: 86% (9493/11038) Checking out files: 87% (9604/11038) Checking out files: 87% (9626/11038) Checking out files: 88% (9714/11038) Checking out files: 88% (9803/11038) Checking out files: 89% (9824/11038) Checking out files: 90% (9935/11038) Checking out files: 91% (10045/11038) Checking out files: 91% (10068/11038) Checking out files: 92% (10155/11038) Checking out files: 93% (10266/11038) Checking out files: 93% (10356/11038) Checking out files: 94% (10376/11038) Checking out files: 95% (10487/11038) Checking out files: 96% (10597/11038) Checking out files: 96% (10647/11038) Checking out files: 97% (10707/11038) Checking out files: 98% (10818/11038) Checking out files: 98% (10882/11038) Checking out files: 99% (10928/11038) Checking out files: 100% (11038/11038) Checking out files: 100% (11038/11038), done. Switched to branch '2.6.39-rc3-stor5' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 35e80dc...c66ac9d master -> scsi-post-merge (forced update) Checking out files: 21% (2695/12448) Checking out files: 22% (2739/12448) Checking out files: 23% (2864/12448) Checking out files: 24% (2988/12448) Checking out files: 25% (3112/12448) Checking out files: 26% (3237/12448) Checking out files: 26% (3360/12448) Checking out files: 27% (3361/12448) Checking out files: 28% (3486/12448) Checking out files: 29% (3610/12448) Checking out files: 30% (3735/12448) Checking out files: 30% (3829/12448) Checking out files: 31% (3859/12448) Checking out files: 32% (3984/12448) Checking out files: 32% (4080/12448) Checking out files: 33% (4108/12448) Checking out files: 34% (4233/12448) Checking out files: 34% (4317/12448) Checking out files: 35% (4357/12448) Checking out files: 36% (4482/12448) Checking out files: 37% (4606/12448) Checking out files: 37% (4684/12448) Checking out files: 38% (4731/12448) Checking out files: 39% (4855/12448) Checking out files: 40% (4980/12448) Checking out files: 41% (5104/12448) Checking out files: 42% (5229/12448) Checking out files: 42% (5337/12448) Checking out files: 43% (5353/12448) Checking out files: 44% (5478/12448) Checking out files: 45% (5602/12448) Checking out files: 46% (5727/12448) Checking out files: 46% (5804/12448) Checking out files: 47% (5851/12448) Checking out files: 48% (5976/12448) Checking out files: 49% (6100/12448) Checking out files: 49% (6202/12448) Checking out files: 50% (6224/12448) Checking out files: 51% (6349/12448) Checking out files: 52% (6473/12448) Checking out files: 52% (6494/12448) Checking out files: 53% (6598/12448) Checking out files: 54% (6722/12448) Checking out files: 54% (6777/12448) Checking out files: 55% (6847/12448) Checking out files: 56% (6971/12448) Checking out files: 56% (7063/12448) Checking out files: 57% (7096/12448) Checking out files: 58% (7220/12448) Checking out files: 59% (7345/12448) Checking out files: 59% (7362/12448) Checking out files: 60% (7469/12448) Checking out files: 61% (7594/12448) Checking out files: 61% (7638/12448) Checking out files: 62% (7718/12448) Checking out files: 63% (7843/12448) Checking out files: 63% (7931/12448) Checking out files: 64% (7967/12448) Checking out files: 65% (8092/12448) Checking out files: 65% (8215/12448) Checking out files: 66% (8216/12448) Checking out files: 67% (8341/12448) Checking out files: 68% (8465/12448) Checking out files: 69% (8590/12448) Checking out files: 70% (8714/12448) Checking out files: 70% (8759/12448) Checking out files: 71% (8839/12448) Checking out files: 72% (8963/12448) Checking out files: 72% (9062/12448) Checking out files: 73% (9088/12448) Checking out files: 74% (9212/12448) Checking out files: 75% (9336/12448) Checking out files: 75% (9356/12448) Checking out files: 76% (9461/12448) Checking out files: 77% (9585/12448) Checking out files: 77% (9647/12448) Checking out files: 78% (9710/12448) Checking out files: 79% (9834/12448) Checking out files: 79% (9911/12448) Checking out files: 80% (9959/12448) Checking out files: 81% (10083/12448) Checking out files: 81% (10183/12448) Checking out files: 82% (10208/12448) Checking out files: 83% (10332/12448) Checking out files: 83% (10455/12448) Checking out files: 84% (10457/12448) Checking out files: 85% (10581/12448) Checking out files: 86% (10706/12448) Checking out files: 86% (10710/12448) Checking out files: 87% (10830/12448) Checking out files: 88% (10955/12448) Checking out files: 89% (11079/12448) Checking out files: 90% (11204/12448) Checking out files: 90% (11228/12448) Checking out files: 91% (11328/12448) Checking out files: 92% (11453/12448) Checking out files: 92% (11563/12448) Checking out files: 93% (11577/12448) Checking out files: 94% (11702/12448) Checking out files: 95% (11826/12448) Checking out files: 95% (11856/12448) Checking out files: 96% (11951/12448) Checking out files: 97% (12075/12448) Checking out files: 97% (12156/12448) Checking out files: 98% (12200/12448) Checking out files: 99% (12324/12448) Checking out files: 100% (12448/12448) Checking out files: 100% (12448/12448), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.39-rc3-stor5' From . * branch scsi-post-merge -> FETCH_HEAD