From /pub/scm/linux/kernel/git/jejb/../torvalds/linux-2.6 f878133..9c4bc1c master -> origin/mast## Checking out files: 24% (126/519) Checking out files: 25% (130/519) Checking out files: 26% (135/519) Checking out files: 27% (141/519) Checking out files: 28% (Removing 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 ## Auto-merging drivers/scsi/scsi_lib.c Merge made by recursive. Documentation/kernel-parameters.txt | 5 - Documentation/power/runtime_pm.txt | 4 +- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/board-pcontrol-g20.c | 98 +----- arch/arm/mach-at91/board-stamp9g20.c | 82 +++-- arch/arm/mach-at91/clock.c | 2 +- arch/arm/mach-at91/include/mach/stamp9g20.h | 7 + arch/arm/mach-s3c2412/Kconfig | 7 + arch/arm/mach-s3c2412/Makefile | 3 +- arch/arm/mach-s3c2416/Kconfig | 1 + arch/arm/mach-s5pv210/mach-aquila.c | 6 + arch/arm/mach-s5pv210/mach-goni.c | 6 + arch/arm/mach-shmobile/include/mach/entry-macro.S | 30 ++- arch/arm/mach-shmobile/include/mach/vmalloc.h | 2 +- arch/arm/plat-s3c24xx/Kconfig | 2 +- arch/mips/Kconfig | 38 ++- arch/mips/alchemy/common/platform.c | 2 + arch/mips/alchemy/devboards/prom.c | 5 +- arch/mips/ar7/clock.c | 9 +- arch/mips/ar7/time.c | 3 + arch/mips/bcm47xx/setup.c | 153 ++++++--- arch/mips/include/asm/cpu.h | 4 +- arch/mips/include/asm/elf.h | 8 +- arch/mips/include/asm/io.h | 12 +- arch/mips/include/asm/mach-ar7/ar7.h | 3 +- arch/mips/include/asm/mach-bcm47xx/nvram.h | 7 + arch/mips/jz4740/board-qi_lb60.c | 4 +- arch/mips/jz4740/platform.c | 2 +- arch/mips/jz4740/prom.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cpu-probe.c | 7 +- arch/mips/kernel/linux32.c | 13 +- arch/mips/kernel/process.c | 1 - arch/mips/kernel/prom.c | 2 +- arch/mips/kernel/smp-mt.c | 2 +- arch/mips/kernel/traps.c | 44 ++- arch/mips/kernel/vpe.c | 14 +- arch/mips/lib/memset.S | 4 +- arch/mips/loongson/common/env.c | 4 +- arch/mips/math-emu/cp1emu.c | 116 +++++- arch/mips/mm/dma-default.c | 4 +- arch/mips/mm/sc-mips.c | 4 + arch/mips/pmc-sierra/yosemite/py-console.c | 12 +- arch/mips/sibyte/swarm/setup.c | 8 +- arch/mn10300/kernel/time.c | 10 +- arch/tile/include/asm/siFrom . * branch block-for-next -> FETCH_HEAD From . * branch libata-fixes -> FETCH_HEAD From . * branch libata-upstream -> FETCH_HEAD Checking out files: 2% (187/6611) Checking out files: 3% (199/6611) Checking out files: 4% (265/6611) Checking out files: 5% (331/6611) Checking out files: 6% (397/6611) Checking out files: 6% (441/6611) Checking out files: 6% (458/6611) Checking out files: 7% (463/6611) Checking out files: 7% (517/6611) Checking out files: 8% (529/6611) Checking out files: 9% (595/6611) Checking out files: 10% (662/6611) Checking out files: 10% (711/6611) Checking out files: 11% (728/6611) Checking out files: 12% (794/6611) Checking out files: 13% (860/6611) Checking out files: 14% (926/6611) Checking out files: 14% (928/6611) Checking out files: 14% (931/6611) Checking out files: 14% (991/6611) Checking out files: 15% (992/6611) Checking out files: 15% (1045/6611) Checking out files: 16% (1058/6611) Checking out files: 16% (1090/6611) Checking out files: 17% (1124/6611) Checking out files: 18% (1190/6611) Checking out files: 18% (1199/6611) Checking out files: 19% (1257/6611) Checking out files: 20% (1323/6611) Checking out files: 20% (1324/6611) Checking out files: 21% (1389/6611) Checking out files: 21% (1416/6611) Checking out files: 22% (1455/6611) Checking out files: 23% (1521/6611) Checking out files: 23% (1536/6611) Checking out files: 24% (1587/6611) Checking out files: 24% (1648/6611) Checking out files: 25% (1653/6611) Checking out files: 26% (1719/6611) Checking out files: 26% (1723/6611) Checking out files: 27% (1785/6611) Checking out files: 27% (1844/6611) Checking out files: 27% (1846/6611) Checking out files: 28% (1852/6611) Checking out files: 28% (1871/6611) Checking out files: 28% (1907/6611) Checking out files: 29% (1918/6611) Checking out files: 29% (1946/6611) Checking out files: 29% (1952/6611) Checking out files: 30% (1984/6611) Checking out files: 30% (2002/6611) Checking out files: 30% (2011/6611) Checking out files: 31% (2050/6611) Checking out files: 31% (2103/6611) Checking out files: 32% (2116/6611) Checking out files: 32% (2155/6611) Checking out files: 33% (2182/6611) Checking out files: 33% (2236/6611) Checking out files: 34% (2248/6611) Checking out files: 34% (2265/6611) Checking out files: 35% (2314/6611) Checking out files: 35% (2327/6611) Checking out files: 35% (2351/6611) Checking out files: 36% (2380/6611) Checking out files: 36% (2390/6611) Checking out files: 37% (2447/6611) Checking out files: 37% (2464/6611) Checking out files: 38% (2513/6611) Checking out files: 38% (2571/6611) Checking out files: 39% (2579/6611) Checking out files: 39% (2618/6611) Checking out files: 40% (2645/6611) Checking out files: 40% (2647/6611) Checking out files: 40% (2707/6611) Checking out files: 41% (2711/6611) Checking out files: 41% (2757/6611) Checking out files: 42% (2777/6611) Checking out files: 42% (2821/6611) Checking out files: 42% (2841/6611) Checking out files: 43% (2843/6611) Checking out files: 44% (2909/6611) Checking out files: 44% (2926/6611) Checking out files: 44% (2953/6611) Checking out files: 44% (2963/6611) Checking out files: 44% (2965/6611) Checking out files: 44% (2971/6611) Checking out files: 45% (2975/6611) Checking out files: 45% (3022/6611) Checking out files: 46% (3042/6611) Checking out files: 47% (3108/6611) Checking out files: 47% (3138/6611) Checking out files: 48% (3174/6611) Checking out files: 48% (3226/6611) Checking out files: 49% (3240/6611) Checking out files: 50% (3306/6611) Checking out files: 50% (3312/6611) Checking out files: 51% (3372/6611) Checking out files: 51% (3398/6611) Checking out files: 52% (3438/6611) Checking out files: 52% (3494/6611) Checking out files: 53% (3504/6611) Checking out files: 54% (3570/6611) Checking out files: 54% (3597/6611) Checking out files: 54% (3600/6611) Checking out files: 55% (3637/6611) Checking out files: 55% (3666/6611) Checking out files: 55% (3694/6611) Checking out files: 56% (3703/6611) Checking out files: 56% (3711/6611) Checking out files: 57% (3769/6611) Checking out files: 58% (3835/6611) Checking out files: 59% (3901/6611) Checking out files: 59% (3941/6611) Checking out files: 60% (3967/6611) Checking out files: 60% (4005/6611) Checking out files: 60% (4016/6611) Checking out files: 61% (4033/6611) Checking out files: 61% (4091/6611) Checking out files: 62% (4099/6611) Checking out files: 62% (4123/6611) Checking out files: 62% (4131/6611) Checking out files: 62% (4133/6611) Checking out files: 62% (4135/6611) Checking out files: 63% (4165/6611) Checking out files: 63% (4187/6611) Checking out files: 64% (4232/6611) Checking out files: 65% (4298/6611) Checking out files: 66% (4364/6611) Checking out files: 67% (4430/6611) Checking out files: 67% (4438/6611) Checking out files: 68% (4496/6611) Checking out files: 69% (4562/6611) Checking out files: 69% (4578/6611) Checking out files: 70% (4628/6611) Checking out files: 70% (4644/6611) Checking out files: 71% (4694/6611) Checking out files: 71% (4701/6611) Checking out files: 72% (4760/6611) Checking out files: 72% (4763/6611) Checking out files: 73% (4827/6611) Checking out files: 73% (4839/6611) Checking out files: 74% (4893/6611) Checking out files: 74% (4904/6611) Checking out files: 74% (4934/6611) Checking out files: 75% (4959/6611) Checking out files: 75% (4976/6611) Checking out files: 76% (5025/6611) Checking out files: 76% (5032/6611) Checking out files: 77% (5091/6611) Checking out files: 77% (5122/6611) Checking out files: 78% (5157/6611) Checking out files: 78% (5191/6611) Checking out files: 79% (5223/6611) Checking out files: 79% (5268/6611) Checking out files: 79% (5272/6611) Checking out files: 80% (5289/6611) Checking out files: 80% (5294/6611) Checking out files: 80% (5312/6611) Checking out files: 81% (5355/6611) Checking out files: 81% (5373/6611) Checking out files: 81% (5374/6611) Checking out files: 81% (5392/6611) Checking out files: 81% (5416/6611) Checking out files: 82% (5422/6611) Checking out files: 82% (5450/6611) Checking out files: 82% (5464/6611) Checking out files: 82% (5473/6611) Checking out files: 83% (5488/6611) Checking out files: 83% (5514/6611) Checking out files: 83% (5521/6611) Checking out files: 84% (5554/6611) Checking out files: 84% (5589/6611) Checking out files: 85% (5620/6611) Checking out files: 86% (5686/6611) Checking out files: 86% (5740/6611) Checking out files: 87% (5752/6611) Checking out files: 87% (5810/6611) Checking out files: 87% (5813/6611) Checking out files: 88% (5818/6611) Checking out files: 88% (5823/6611) Checking out files: 89% (5884/6611) Checking out files: 89% (5897/6611) Checking out files: 90% (5950/6611) Checking out files: 90% (5985/6611) Checking out files: 91% (6017/6611) Checking out files: 92% (6083/6611) Checking out files: 92% (6084/6611) Checking out files: 92% (6136/6611) Checking out files: 93% (6149/6611) Checking out files: 93% (6154/6611) Checking out files: 94% (6215/6611) Checking out files: 94% (6235/6611) Checking out files: 94% (6255/6611) Checking out files: 94% (6273/6611) Checking out files: 95% (6281/6611) Checking out files: 96% (6347/6611) Checking out files: 96% (6355/6611) Checking out files: 97% (6413/6611) Checking out files: 97% (6428/6611) Checking out files: 98% (6479/6611) Checking out files: 99% (6545/6611) Checking out files: 100% (6611/6611) Checking out files: 100% (6611/6611), done. Switched to branch 'device-mapper' Checking out files: 15% (1026/6633) Checking out files: 16% (1062/6633) Checking out files: 17% (1128/6633) Checking out files: 18% (1194/6633) Checking out files: 19% (1261/6633) Checking out files: 20% (1327/6633) Checking out files: 21% (1393/6633) Checking out files: 22% (1460/6633) Checking out files: 22% (1470/6633) Checking out files: 23% (1526/6633) Checking out files: 23% (1548/6633) Checking out files: 23% (1550/6633) Checking out files: 24% (1592/6633) Checking out files: 25% (1659/6633) Checking out files: 26% (1725/6633) Checking out files: 26% (1753/6633) Checking out files: 27% (1791/6633) Checking out files: 28% (1858/6633) Checking out files: 28% (1860/6633) Checking out files: 29% (1924/6633) Checking out files: 29% (1965/6633) Checking out files: 30% (1990/6633) Checking out files: 30% (2016/6633) Checking out files: 31% (2057/6633) Checking out files: 31% (2076/6633) Checking out files: 32% (2123/6633) Checking out files: 32% (2172/6633) Checking out files: 33% (2189/6633) Checking out files: 34% (2256/6633) Checking out files: 34% (2305/6633) Checking out files: 35% (2322/6633) Checking out files: 36% (2388/6633) Checking out files: 37% (2455/6633) Checking out files: 38% (2521/6633) Checking out files: 38% (2547/6633) Checking out files: 38% (2575/6633) Checking out files: 39% (2587/6633) Checking out files: 39% (2612/6633) Checking out files: 40% (2654/6633) Checking out files: 41% (2720/6633) Checking out files: 42% (2786/6633) Checking out files: 43% (2853/6633) Checking out files: 43% (2854/6633) Checking out files: 44% (2919/6633) Checking out files: 45% (2985/6633) Checking out files: 45% (3016/6633) Checking out files: 46% (3052/6633) Checking out files: 47% (3118/6633) Checking out files: 48% (3184/6633) Checking out files: 48% (3204/6633) Checking out files: 49% (3251/6633) Checking out files: 50% (3317/6633) Checking out files: 50% (3341/6633) Checking out files: 51% (3383/6633) Checking out files: 52% (3450/6633) Checking out files: 52% (3478/6633) Checking out files: 53% (3516/6633) Checking out files: 54% (3582/6633) Checking out files: 54% (3591/6633) Checking out files: 55% (3649/6633) Checking out files: 55% (3704/6633) Checking out files: 56% (3715/6633) Checking out files: 57% (3781/6633) Checking out files: 57% (3789/6633) Checking out files: 57% (3796/6633) Checking out files: 58% (3848/6633) Checking out files: 58% (3851/6633) Checking out files: 59% (3914/6633) Checking out files: 60% (3980/6633) Checking out files: 60% (4038/6633) Checking out files: 61% (4047/6633) Checking out files: 62% (4113/6633) Checking out files: 63% (4179/6633) Checking out files: 63% (4200/6633) Checking out files: 64% (4246/6633) Checking out files: 65% (4312/6633) Checking out files: 65% (4320/6633) Checking out files: 65% (4335/6633) Checking out files: 65% (4341/6633) Checking out files: 65% (4345/6633) Checking out files: 65% (4346/6633) Checking out files: 66% (4378/6633) Checking out files: 66% (4395/6633) Checking out files: 67% (4445/6633) Checking out files: 68% (4511/6633) Checking out files: 68% (4517/6633) Checking out files: 69% (4577/6633) Checking out files: 70% (4644/6633) Checking out files: 70% (4680/6633) Checking out files: 71% (4710/6633) Checking out files: 71% (4724/6633) Checking out files: 71% (4726/6633) Checking out files: 71% (4737/6633) Checking out files: 71% (4738/6633) Checking out files: 71% (4740/6633) Checking out files: 71% (4743/6633) Checking out files: 71% (4745/6633) Checking out files: 71% (4750/6633) Checking out files: 71% (4754/6633) Checking out files: 71% (4761/6633) Checking out files: 71% (4767/6633) Checking out files: 71% (4771/6633) Checking out files: 71% (4773/6633) Checking out files: 71% (4774/6633) Checking out files: 72% (4776/6633) Checking out files: 72% (4782/6633) Checking out files: 72% (4785/6633) Checking out files: 72% (4788/6633) Checking out files: 72% (4790/6633) Checking out files: 72% (4794/6633) Checking out files: 72% (4801/6633) Checking out files: 72% (4803/6633) Checking out files: 72% (4810/6633) Checking out files: 73% (4843/6633) Checking out files: 73% (4881/6633) Checking out files: 74% (4909/6633) Checking out files: 74% (4943/6633) Checking out files: 75% (4975/6633) Checking out files: 75% (5003/6633) Checking out files: 76% (5042/6633) Checking out files: 76% (5045/6633) Checking out files: 76% (5097/6633) Checking out files: 77% (5108/6633) Checking out files: 77% (5117/6633) Checking out files: 77% (5172/6633) Checking out files: 78% (5174/6633) Checking out files: 78% (5224/6633) Checking out files: 79% (5241/6633) Checking out files: 79% (5299/6633) Checking out files: 80% (5307/6633) Checking out files: 81% (5373/6633) Checking out files: 81% (5378/6633) Checking out files: 81% (5417/6633) Checking out files: 81% (5424/6633) Checking out files: 82% (5440/6633) Checking out files: 82% (5454/6633) Checking out files: 83% (5506/6633) Checking out files: 83% (5518/6633) Checking out files: 84% (5572/6633) Checking out files: 84% (5593/6633) Checking out files: 85% (5639/6633) Checking out files: 85% (5659/6633) Checking out files: 85% (5703/6633) Checking out files: 86% (5705/6633) Checking out files: 87% (5771/6633) Checking out files: 87% (5806/6633) Checking out files: 88% (5838/6633) Checking out files: 89% (5904/6633) Checking out files: 89% (5914/6633) Checking out files: 89% (5955/6633) Checking out files: 90% (5970/6633) Checking out files: 90% (6033/6633) Checking out files: 91% (6037/6633) Checking out files: 92% (6103/6633) Checking out files: 92% (6165/6633) Checking out files: 93% (6169/6633) Checking out files: 93% (6183/6633) Checking out files: 94% (6236/6633) Checking out files: 94% (6260/6633) Checking out files: 94% (6278/6633) Checking out files: 94% (6285/6633) Checking out files: 94% (6287/6633) Checking out files: 94% (6299/6633) Checking out files: 95% (6302/6633) Checking out files: 95% (6321/6633) Checking out files: 95% (6324/6633) Checking out files: 96% (6368/6633) Checking out files: 96% (6409/6633) Checking out files: 97% (6435/6633) Checking out files: 98% (6501/6633) Checking out files: 98% (6521/6633) Checking out files: 99% (6567/6633) Checking out files: 99% (6619/6633) Checking out files: 100% (6633/6633) Checking out files: 100% (6633/6633), done. Switched to branch '2.6.37-rc6-stor24' From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + 829f20f...7d2087a master -> scsi-post-merge (forced update) Checking out files: 33% (178/524) Checking out files: 34% (179/524) Checking out files: 35% (184/524) Checking out files: 36% (189/524) Checking out files: 37% (194/524) Checking out files: 38% (200/524) Checking out files: 39% (205/524) Checking out files: 40% (210/524) Checking out files: 41% (215/524) Checking out files: 42% (221/524) Checking out files: 43% (226/524) Checking out files: 44% (231/524) Checking out files: 45% (236/524) Checking out files: 46% (242/524) Checking out files: 47% (247/524) Checking out files: 48% (252/524) Checking out files: 49% (257/524) Checking out files: 50% (262/524) Checking out files: 51% (268/524) Checking out files: 52% (273/524) Checking out files: 53% (278/524) Checking out files: 54% (283/524) Checking out files: 55% (289/524) Checking out files: 56% (294/524) Checking out files: 57% (299/524) Checking out files: 57% (302/524) Checking out files: 58% (304/524) Checking out files: 59% (310/524) Checking out files: 60% (315/524) Checking out files: 61% (320/524) Checking out files: 62% (325/524) Checking out files: 63% (331/524) Checking out files: 64% (336/524) Checking out files: 65% (341/524) Checking out files: 66% (346/524) Checking out files: 67% (352/524) Checking out files: 68% (357/524) Checking out files: 69% (362/524) Checking out files: 70% (367/524) Checking out files: 71% (373/524) Checking out files: 72% (378/524) Checking out files: 73% (383/524) Checking out files: 74% (388/524) Checking out files: 75% (393/524) Checking out files: 76% (399/524) Checking out files: 77% (404/524) Checking out files: 78% (409/524) Checking out files: 79% (414/524) Checking out files: 80% (420/524) Checking out files: 81% (425/524) Checking out files: 81% (427/524) Checking out files: 82% (430/524) Checking out files: 83% (435/524) Checking out files: 84% (441/524) Checking out files: 85% (446/524) Checking out files: 86% (451/524) Checking out files: 87% (456/524) Checking out files: 88% (462/524) Checking out files: 89% (467/524) Checking out files: 90% (472/524) Checking out files: 91% (477/524) Checking out files: 92% (483/524) Checking out files: 93% (488/524) Checking out files: 94% (493/524) Checking out files: 95% (498/524) Checking out files: 96% (504/524) Checking out files: 97% (509/524) Checking out files: 98% (514/524) Checking out files: 99% (519/524) Checking out files: 100% (524/524) Checking out files: 100% (524/524), done. Switched to branch 'scsi-post-merge' Switched to branch '2.6.37-rc6-stor24' From . * branch scsi-post-merge -> FETCH_HEAD | 2 +- include/linux/ceph/libceph.h | 6 +- include/linux/kthread.h | 45 ++++- include/linux/netlink.h | 2 +- include/linux/taskstats.h | 3 +- include/linux/unaligned/packed_struct.h | 6 +- include/net/flow.h | 1 - include/net/ip6_route.h | 10 + include/net/mac80211.h | 28 +++- include/net/pkt_cls.h | 4 +- include/net/sch_generic.h | 6 +- include/net/sock.h | 3 + kernel/kthread.c | 11 ++ kernel/taskstats.c | 57 +++++-- mm/compaction.c | 1 - mm/migrate.c | 2 + mm/page-writeback.c | 2 +- mm/percpu.c | 2 +- net/bluetooth/rfcomm/core.c | 1 + net/bridge/br_multicast.c | 2 +- net/ceph/messenger.c | 8 +- net/ceph/pagevec.c | 15 +- net/core/fib_rules.c | 3 +- net/core/sock.c | 47 ++++-- net/ipv4/fib_frontend.c | 10 +- net/ipv4/route.c | 7 +- net/ipv4/tcp_ipv4.c | 4 +- net/ipv4/udp.c | 1 + net/ipv4/udplite.c | 1 + net/ipv6/addrconf.c | 4 +- net/ipv6/ip6_output.c | 12 +- net/ipv6/route.c | 7 +- net/ipv6/udp.c | 1 + net/ipv6/udplite.c | 1 + net/ipv6/xfrm6_output.c | 16 ++- net/irda/af_irda.c | 18 ++- net/mac80211/ibss.c | 4 + net/mac80211/rx.c | 5 +- net/mac80211/work.c | 5 +- net/sched/sch_sfq.c | 20 +-- net/sctp/socket.c | 2 +- security/keys/request_key.c | 1 - sound/core/pcm_lib.c | 10 +- sound/pci/hda/hda_codec.c | 57 ++++--- sound/pci/hda/patch_realtek.c | 64 +++++--- sound/pci/hda/patch_sigmatel.c | 5 +- tools/perf/builtin-buildid-list.c | 3 +- tools/perf/builtin-probe.c | 5 + tools/perf/util/header.c | 10 +- tools/perf/util/probe-event.c | 15 ++- tools/perf/util/probe-finder.c | 85 ++++++---- tools/perf/util/string.c | 2 +- tools/perf/util/symbol.c | 4 +- tools/perf/util/symbol.h | 2 + 156 files changed, 1379 insertions(+), 658 deletions(-) ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merging drivers/scsi/ipr.c Merge made by recursive. Documentation/filesystems/Locking | 212 ++++++------ Documentation/kernel-parameters.txt | 2 +- MAINTAINERS | 17 +- Makefile | 2 +- arch/arm/common/it8152.c | 1 + arch/arm/include/asm/hardware/it8152.h | 1 + arch/arm/include/asm/highmem.h | 3 - arch/arm/include/asm/sizes.h | 6 +- arch/arm/include/asm/system.h | 1 + arch/arm/kernel/entry-common.S | 6 + arch/arm/kernel/smp.c | 1 - arch/arm/mach-at91/include/mach/at91_mci.h | 2 + arch/arm/mach-ixp4xx/common-pci.c | 2 +- arch/arm/mach-pxa/Kconfig | 1 + arch/arm/mach-pxa/sleep.S | 4 +- arch/arm/mm/cache-feroceon-l2.c | 37 +- arch/arm/mm/cache-xsc3l2.c | 57 ++-- arch/arm/mm/dma-mapping.c | 7 +- arch/arm/mm/flush.c | 7 +- arch/arm/mm/highmem.c | 87 ----- arch/mn10300/kernel/irq.c | 2 +- arch/sh/boards/mach-se/7206/irq.c | 2 +- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 2 +- arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 3 +- arch/x86/kernel/microcode_intel.c | 16 +- arch/x86/kvm/i8259.c | 2 + arch/x86/kvm/mmu.c | 3 +- arch/x86/oprofile/op_model_amd.c | 24 +- drivers/acpi/acpica/evgpeinit.c | 3 + drivers/acpi/battery.c | 5 - drivers/acpi/scan.c | 97 ++++-- drivers/ata/Kconfig | 28 +- 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/ata/pata_hpt366.c | 51 ++-- drivers/ata/pata_hpt37x.c | 236 ++++++++----- drivers/ata/pata_hpt3x2n.c | 150 ++++++--- drivers/atm/atmtcp.c | 5 +- drivers/char/ramoops.c | 12 +- drivers/dma/mv_xor.c | 2 +- drivers/gpu/drm/i915/dvo_ch7017.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 23 ++ drivers/gpu/drm/i915/i915_reg.h | 10 + drivers/gpu/drm/i915/intel_bios.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 21 +- drivers/gpu/drm/i915/intel_sdvo.c | 3 +- drivers/hwmon/s3c-hwmon.c | 2 - drivers/isdn/gigaset/capi.c | 1 + drivers/media/video/cx25840/cx25840-core.c | 19 +- drivers/media/video/cx88/cx88-alsa.c | 99 +----- drivers/media/video/cx88/cx88-cards.c | 7 + drivers/media/video/cx88/cx88-video.c | 27 +-- drivers/media/video/cx88/cx88.h | 6 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/soc_camera.c | 4 +- drivers/media/video/wm8775.c | 104 ++---- drivers/mmc/core/core.c | 1 + drivers/mmc/host/at91_mci.c | 13 +- drivers/mmc/host/atmel-mci.c | 18 +- drivers/net/atlx/atl1.c | 10 + drivers/net/cnic.c | 10 +- drivers/net/ehea/ehea_ethtool.c | 7 + drivers/net/ppp_generic.c | 9 +- drivers/net/skfp/skfddi.c | 2 +- drivers/net/starfire.c | 2 +- drivers/net/tg3.c | 2 +- drivers/pci/hotplug/pciehp_acpi.c | 3 +- drivers/platform/x86/intel_ips.c | 36 ++- drivers/platform/x86/intel_ips.h | 21 ++ drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- drivers/sh/intc/core.c | 1 + drivers/spi/coldfire_qspi.c | 2 +- drivers/spi/omap2_mcspi.c | 39 ++ drivers/staging/zram/zram_drv.c | 6 - drivers/usb/atm/ueagle-atm.c | 22 +- drivers/video/fbmem.c | 2 +- drivers/video/imxfb.c | 9 +- drivers/video/sh_mobile_hdmi.c | 16 +- drivers/video/sh_mobile_lcdcfb.c | 30 +- include/linux/dmaengine.h | 13 +- include/linux/libata.h | 6 +- include/media/wm8775.h | 3 - init/do_mounts.c | 2 +- kernel/trace/ring_buffer.c | 9 +- kernel/user.c | 1 + kernel/watchdog.c | 3 +- mm/memcontrol.c | 19 +- mm/nommu.c | 28 ++- net/bridge/br_multicast.c | 28 +- net/bridge/br_stp_bpdu.c | 2 + net/can/bcm.c | 4 +- net/ipv4/route.c | 8 +- scripts/kconfig/menu.c | 14 + security/integrity/ima/ima_policy.c | 2 + sound/oss/soundcard.c | 4 +- sound/pci/hda/hda_intel.c | 1 + sound/soc/codecs/max98088.c | 10 +- sound/soc/codecs/wm8523.c | 9 +- sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8753.c | 226 +++++-------- sound/soc/codecs/wm8904.c | 37 +- sound/soc/codecs/wm8940.c | 1 + sound/soc/codecs/wm8955.c | 31 +- sound/soc/codecs/wm8960.c | 1 + sound/soc/codecs/wm8962.c | 45 +-- sound/soc/codecs/wm8971.c | 1 + sound/soc/codecs/wm9081.c | 1 + sound/soc/codecs/wm9090.c | 18 +- tools/perf/util/hist.c | 2 +- 113 files changed, 1758 insertions(+), 1081 deletions(-) create mode 100644 drivers/ata/acard-ahci.c create mode 100644 drivers/platform/x86/intel_ips.h ## # 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-from-kcopyd.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-ioctl-suppress-needless-warning-messages.patch dm-iostats.patch dm-kcopyd-add-async-destruction-option.patch dm-kcopyd-delay-unplugging.patch dm-kcopyd-delay-unplugging.patch.old dm-log-use-PTR_ERR-value-instead-of-ENOMEM.patch dm-log-userspace-add-version-number-to-comms.patch dm-log-userspace-group-clear-and-mark-requests.patch dm-log-userspace-split-flush-queue.patch dm-log-userspace-trap-all-failed-log-construction-errors.patch dm-loop.patch dm-memcache.patch dm-mpath-add-alua.patch dm-mpath-delay-activate_path-retry-on-SCSI_DH_RETRY-old.patch dm-mpath-delay-activate_path-retry-on-SCSI_DH_RETRY.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-per-target-unplug-callback-support.patch dm-raid-add-iterate_devices-and-io_hints-functions.patch dm-raid-add-suspend-and-resume-functions.patch dm-raid-introduce-target-callbacks-and-congestion-callback.patch dm-raid-per-target-unplug-callback-support.patch dm-raid-skeleton-raid456-target-support.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-raid456-basic-support.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-remove-superfluous-irq-disablement-in-dm_request_fn.patch dm-snapshot-avoid-storing-private-suspended-state.patch dm-snapshot-cleanup-style.patch dm-snapshot-invalidate-from-workqueue.patch dm-snapshot-persistent-make-metadata_wq-multithreaded.patch dm-snapshot-release-memory-if-invalid.patch dm-snapshot-remove-unused-dm_snapshot-queued_bios_work.patch dm-split-bios-into-only-two-pieces.patch dm-stripe-switch-from-local-workqueue-to-system_wq.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-initialisation-functions.patch dm-use-non-reentrant-workqueues-if-equivalent.patch dm-use-singlethread-workqueues.patch dm-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 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 170675454 bytes received 2333 bytes 8752707.03 bytes/sec total size is 170642227 speedup is 1.00 Using base v2.6.37-6858-g581548d dm-dont-take-i_mutex-to-change-device-size.patch dm-mpath-disable-blk_abort_queue.patch dm-io-remove-BIO_RW_SYNCIO-flag-from-kcopyd.patch dm-ioctl-allow-rename-to-fill-empty-uuid.patch dm-raid1-support-discard.patch dm-remove-dm_mutex-after-bkl-conversion.patch dm-crypt-set-key-size-early.patch dm-log-userspace-trap-all-failed-log-construction-errors.patch dm-kcopyd-delay-unplugging.patch dm-log-userspace-split-flush-queue.patch dm-log-userspace-group-clear-and-mark-requests.patch dm-log-userspace-add-version-number-to-comms.patch dm-crypt-simplify-compatible-table-output.patch dm-crypt-scale-to-multiple-cpus.patch dm-crypt-use-io-thread-for-reads-only-if-mempool-exhausted.patch dm-crypt-add-post-iv-call-to-iv-generator.patch dm-crypt-add-multi-key-capability.patch dm-crypt-add-loop-aes-iv-generator.patch dm-ioctl-suppress-needless-warning-messages.patch dm-snapshot-remove-unused-dm_snapshot-queued_bios_work.patch dm-dont-use-flush_scheduled_work.patch dm-stripe-switch-from-local-workqueue-to-system_wq.patch dm-convert-workqueues-to-alloc_ordered.patch dm-use-non-reentrant-workqueues-if-equivalent.patch dm-snapshot-persistent-make-metadata_wq-multithreaded.patch dm-snapshot-avoid-storing-private-suspended-state.patch dm-log-use-PTR_ERR-value-instead-of-ENOMEM.patch dm-remove-superfluous-irq-disablement-in-dm_request_fn.patch dm-mpath-delay-activate_path-retry-on-SCSI_DH_RETRY.patch dm-introduce-target-callbacks-and-congestion-callback.patch dm-per-target-unplug-callback-support.patch dm-raid456-basic-support.patch ## # 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... Applying: [SCSI] sd: implement sd_check_events() Applying: [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event Applying: [SCSI] target: Add LIO target core v4.0.0-rc6 Updating 3d9efc5..7fd6d4b Fast-forward Documentation/target/tcm_mod_builder.py | 1094 +++++ Documentation/target/tcm_mod_builder.txt | 145 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/scsi/sd.c | 103 +- drivers/scsi/sd.h | 1 - drivers/scsi/sr.c | 4 - drivers/target/Kconfig | 32 + drivers/target/Makefile | 24 + drivers/target/target_core_alua.c | 1991 +++++++++ drivers/target/target_core_alua.h | 126 + drivers/target/target_core_cdb.c | 1131 +++++ drivers/target/target_core_configfs.c | 3225 ++++++++++++++ drivers/target/target_core_device.c | 1694 +++++++ drivers/target/target_core_fabric_configfs.c | 999 +++++ drivers/target/target_core_fabric_lib.c | 451 ++ drivers/target/target_core_file.c | 688 +++ drivers/target/target_core_file.h | 50 + drivers/target/target_core_hba.c | 185 + drivers/target/target_core_hba.h | 7 + drivers/target/target_core_iblock.c | 808 ++++ drivers/target/target_core_iblock.h | 40 + drivers/target/target_core_mib.c | 1078 +++++ drivers/target/target_core_mib.h | 28 + drivers/target/target_core_pr.c | 4251 ++++++++++++++++++ drivers/target/target_core_pr.h | 67 + drivers/target/target_core_pscsi.c | 1470 ++++++ drivers/target/target_core_pscsi.h | 65 + drivers/target/target_core_rd.c | 1091 +++++ drivers/target/target_core_rd.h | 73 + drivers/target/target_core_scdb.c | 105 + drivers/target/target_core_scdb.h | 10 + drivers/target/target_core_tmr.c | 404 ++ drivers/target/target_core_tpg.c | 826 ++++ drivers/target/target_core_transport.c | 6134 ++++++++++++++++++++++++++ drivers/target/target_core_ua.c | 332 ++ drivers/target/target_core_ua.h | 36 + include/target/configfs_macros.h | 147 + include/target/target_core_base.h | 937 ++++ include/target/target_core_configfs.h | 52 + include/target/target_core_device.h | 61 + include/target/target_core_fabric_configfs.h | 106 + include/target/target_core_fabric_lib.h | 28 + include/target/target_core_fabric_ops.h | 100 + include/target/target_core_tmr.h | 43 + include/target/target_core_tpg.h | 35 + include/target/target_core_transport.h | 351 ++ 47 files changed, 30573 insertions(+), 58 deletions(-) create mode 100755 Documentation/target/tcm_mod_builder.py create mode 100644 Documentation/target/tcm_mod_builder.txt create mode 100644 drivers/target/Kconfig create mode 100644 drivers/target/Makefile create mode 100644 drivers/target/target_core_alua.c create mode 100644 drivers/target/target_core_alua.h create mode 100644 drivers/target/target_core_cdb.c create mode 100644 drivers/target/target_core_configfs.c create mode 100644 drivers/target/target_core_device.c create mode 100644 drivers/target/target_core_fabric_configfs.c create mode 100644 drivers/target/target_core_fabric_lib.c create mode 100644 drivers/target/target_core_file.c create mode 100644 drivers/target/target_core_file.h create mode 100644 drivers/target/target_core_hba.c create mode 100644 drivers/target/target_core_hba.h create mode 100644 drivers/target/target_core_iblock.c create mode 100644 drivers/target/target_core_iblock.h create mode 100644 drivers/target/target_core_mib.c create mode 100644 drivers/target/target_core_mib.h create mode 100644 drivers/target/target_core_pr.c create mode 100644 drivers/target/target_core_pr.h create mode 100644 drivers/target/target_core_pscsi.c create mode 100644 drivers/target/target_core_pscsi.h create mode 100644 drivers/target/target_core_rd.c create mode 100644 drivers/target/target_core_rd.h create mode 100644 drivers/target/target_core_scdb.c create mode 100644 drivers/target/target_core_scdb.h create mode 100644 drivers/target/target_core_tmr.c create mode 100644 drivers/target/target_core_tpg.c create mode 100644 drivers/target/target_core_transport.c create mode 100644 drivers/target/target_core_ua.c create mode 100644 drivers/target/target_core_ua.h create mode 100644 include/target/configfs_macros.h create mode 100644 include/target/target_core_base.h create mode 100644 include/target/target_core_configfs.h create mode 100644 include/target/target_core_device.h create mode 100644 include/target/target_core_fabric_configfs.h create mode 100644 include/target/target_core_fabric_lib.h create mode 100644 include/target/target_core_fabric_ops.h create mode 100644 include/target/target_core_tmr.h create mode 100644 include/target/target_core_tpg.h create mode 100644 include/target/target_core_transport.h ## # check ## Differences exist, continuing ## # label ## [2.6.37-rc6-stor24 b1e2e14] 2.6.37-rc6-stor24 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- ##