From /pub/scm/linux/kernel/git/torvalds/linux-2.6 e315c12..6fdf5e6 master -> linus Switched to branch "2.6.25-rc8-mc8" Switched to branch "ide" Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc8-mc8" Switched to branch "gregkh-driver" Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Switched to branch "2.6.25-rc8-mc8" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Switched to branch "gregkh-ldp" .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. .dotest/patch:58: trailing whitespace. obj-$(CONFIG_SLICOSS) += slicoss.o .dotest/patch:24450: space before tab in indent. ushort DramRomFn; // 14 Dram/Rom function warning: 2 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc8" error: branch 'agp' not found. remote: Counting objects: 1 remote: Counting objects: 9, done. remote: Compressing objects: 20% (1/5) remote: Compressing objects: 40% (2/5) remote: Compressing objects: 60% (3/5) remote: Compressing objects: 8remote: 0% (4/5) remote: Compressing objects: 100% (5/5) remote: Compressing objects: 100% (5/5), done. remote: Total 5 (delta 4), reused 0 (delta 0) From /pub/scm/linux/kernel/git/sfrench/cifs-2.6 e315c12..932e2d2 master -> cifs Switched to branch "i2c" Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" remote: Counting objects: 1 remote: Counting objects: 95 remote: Counting objects: 7017, done. remote: Compressing objects: 0% (1/1812) remote: Compressing objects: 1% (19/1812) remote: Compressing objects: 2% (37/1812) remote: Compressing objects: 3% (55/1812) remote: Compressing objects: 4% (73/1812) remote: Compressing objects: 5% (91/1812) remote: Compressing objects: 6% (109/1812) remote: Compressing objects: 7% (127/1812) remote: Compressing objects: 8% (145/1812) remote: Compressing objects: 9% (164/1812) remote: Compressing objects: 10% (182/1812) remote: Compressing objects: 11% (200/1812) remote: Compressing objects: 12% (218/1812) remote: Compressing objects: 13% (236/1812) remote: Compressing objects: 14% (254/1812) remote: Compressing objects: 15% (272/1812) remote: Compressing objects: 16% (290/1812) remote: Compressing objects: 17% (309/1812) remote: Compressing objects: 18% (327/1812) remote: Compressing objects: 19% (345/1812) remote: Compressing objects: 20% (363/1812) remote: Compressing objects: 21% (381/1812) remote: Compressing objects: 22% (399/1812) remote: Compressing objects: 23% (417/1812) remote: Compressing objects: 24% (435/1812) remote: Compressing objects: 25% (453/1812) remote: Compressing objects: 26% (472/1812) remote: Compressing objects: 27% (490/1812) remote: Compressing objects: 28% (508/1812) remote: Compressing objects: 29% (526/1812) remote: Compressing objects: 30% (544/1812) remote: Compressing objects: 31% (562/1812) remote: Compressing objects: 32% (580/1812) remote: Compressing objects: 33% (598/1812) remote: Compressing objects: 34% (617/1812) remote: Compressing objects: 35% (635/1812) remote: Compressing objects: 36% (653/1812) remote: Compressing objects: 37% (671/1812) remote: Compressing objects: 38% (689/1812) remote: Compressing objects: 39% (707/1812) remote: Compressing objects: 40% (725/1812) remote: Compressing objects: 41% (743/1812) remote: Compressing objects: 42% (762/1812) remote: Compressing objects: 43% (780/1812) remote: Compressing objects: 44% (798/1812) remote: Compressing objects: 45% (816/1812) remote: Compressing objects: 46% (834/1812) remote: Compressing objects: 47% (852/1812) remote: Compressing objects: 48% (870/1812) remote: Compressing objects: 49% (888/1812) remote: Compressing objects: 50% (906/1812) remote: Compressing objects: 51% (925/1812) remote: Compressing objects: 52% (943/1812) remote: Compressing objects: 53% (961/1812) remote: Compressing objects: 54% (979/1812) remote: Compressing objects: 55% (997/1812) remote: Compressing objects: 56% (1015/1812) remote: Compressing objects: 57% (1033/1812) remote: Compressing objects: 58% (1051/1812) remote: Compressing objects: 59% (1070/1812) remote: Compressing objects: 60% (1088/1812) remote: Compressing objects: 61% (1106/1812) remote: Compressing objects: 62% (1124/1812) remote: Compressing objects: 63% (1142/1812) remote: Compressing objects: 64% (1160/1812) remote: Compressing objects: 65% (1178/1812) remote: Compressing objects: 66% (1196/1812) remote: Compressing objects: 67% (1215/1812) remote: Compressing objects: 68% (1233/1812) remote: Compressing objects: 69% (1251/1812) remote: Compressing objects: 70% (1269/1812) remote: Compressing objects: 71% (1287/1812) remote: Compressing objects: 72% (1305/1812) remote: Compressing objects: 73% (1323/1812) remote: Compressing objects: 74% (1341/1812) remote: Compressing objects: 75% (1359/1812) remote: Compressing objects: 76% (1378/1812) remote: Compressing objects: 77% (1396/1812) remote: Compressing objects: 78% (1414/1812) remote: Compressing objects: 79% (1432/1812) remote: Compressing objects: 80% (1450/1812) remote: Compressing objects: 81% (1468/1812) remote: Compressing objects: 82% (1486/1812) remote: Compressing objects: 83% (1504/1812) remote: Compressing objects: 84% (1523/1812) remote: Compressing objects: 85% (1541/1812) remote: Compressing objects: 86% (1559/1812) remote: Compressing objects: 87% (1577/1812) remote: Compressing objects: 88% (1595/1812) remote: Compressing objects: 89% (1613/1812) remote: Compressing objects: 90% (1631/1812) remote: Compressing objects: 91% (1649/1812) remote: Compressing objects: 92% (1668/1812) remote: Compressing objects: 93% (1686/1812) remote: Compressing objects: 94% (1704/1812) remote: Compressing objects: 95% (1722/1812) remote: Compressing objects: 96% (1740/1812) remote: Compressing objects: 97% (1758/1812) remote: Compressing objects: 98% (1776/1812) remote: Compressing objects: 99% (1794/1812) remote: Compressing objects: 100% (1812/1812) remote: Compressing objects: 100% (1812/1812), done. Receiving objects: 0% (1/6758) Receiving objects: 1% (68/6758) Receiving objects: 2% (136/6758) Receiving objects: 3% (203/6758) Receiving objects: 4% (271/6758) Receiving objects: 5% (338/6758) Receiving objects: 6% (406/6758) Receiving objects: 7% (474/6758) Receiving objects: 8% (541/6758) Receiving objects: 9% (609/6758) Receiving objects: 10% (676/6758) Receiving objects: 11% (744/6758) Receiving objects: 12% (811/6758) Receiving objects: 13% (879/6758) Receiving objects: 14% (947/6758) Receiving objects: 15% (1014/6758) Receiving objects: 16% (1082/6758) Receiving objects: 17% (1149/6758) Receiving objects: 18% (1217/6758) Receiving objects: 19% (1285/6758) Receiving objects: 20% (1352/6758) Receiving objects: 21% (1420/6758) Receiving objects: 22% (1487/6758) Receiving objects: 23% (1555/6758) Receiving objects: 24% (1622/6758) Receiving objects: 25% (1690/6758) Receiving objects: 26% (1758/6758) Receiving objects: 27% (1825/6758) Receiving objects: 28% (1893/6758) Receiving objects: 29% (1960/6758) Receiving objects: 30% (2028/6758) Receiving objects: 31% (2095/6758) Receiving objects: 32% (2163/6758) Receiving objects: 33% (2231/6758) Receiving objects: 34% (2298/6758), 563.99 KiB | 789 KiB/s Receiving objects: 35% (2366/6758), 563.99 KiB | 789 KiB/s Receiving objects: 36% (2433/6758), 563.99 KiB | 789 KiB/s Receiving objects: 37% (2501/6758), 563.99 KiB | 789 KiB/s Receiving objects: 38% (2569/6758), 563.99 KiB | 789 KiB/s Receiving objects: 39% (2636/6758), 563.99 KiB | 789 KiB/s Receiving objects: 40% (2704/6758), 563.99 KiB | 789 KiB/s Receiving objects: 41% (2771/6758), 563.99 KiB | 789 KiB/s Receiving objects: 42% (2839/6758), 563.99 KiB | 789 KiB/s Receiving objects: 43% (2906/6758), 563.99 KiB | 789 KiB/s Receiving objects: 44% (2974/6758), 563.99 KiB | 789 KiB/s Receiving objects: 45% (3042/6758), 563.99 KiB | 789 KiB/s Receiving objects: 46% (3109/6758), 563.99 KiB | 789 KiB/s Receiving objects: 47% (3177/6758), 563.99 KiB | 789 KiB/s Receiving objects: 48% (3244/6758), 563.99 KiB | 789 KiB/s Receiving objects: 49% (3312/6758), 563.99 KiB | 789 KiB/s Receiving objects: 50% (3379/6758), 563.99 KiB | 789 KiB/s Receiving objects: 51% (3447/6758), 563.99 KiB | 789 KiB/s Receiving objects: 52% (3515/6758), 563.99 KiB | 789 KiB/s Receiving objects: 53% (3582/6758), 563.99 KiB | 789 KiB/s Receiving objects: 54% (3650/6758), 563.99 KiB | 789 KiB/s Receiving objects: 55% (3717/6758), 563.99 KiB | 789 KiB/s Receiving objects: 56% (3785/6758), 563.99 KiB | 789 KiB/s Receiving objects: 57% (3853/6758), 563.99 KiB | 789 KiB/s Receiving objects: 58% (3920/6758), 563.99 KiB | 789 KiB/s Receiving objects: 59% (3988/6758), 563.99 KiB | 789 KiB/s Receiving objects: 60% (4055/6758), 563.99 KiB | 789 KiB/s Receiving objects: 61% (4123/6758), 563.99 KiB | 789 KiB/s Receiving objects: 62% (4190/6758), 563.99 KiB | 789 KiB/s Receiving objects: 63% (4258/6758), 563.99 KiB | 789 KiB/s Receiving objects: 64% (4326/6758), 563.99 KiB | 789 KiB/s Receiving objects: 65% (4393/6758), 563.99 KiB | 789 KiB/s Receiving objects: 66% (4461/6758), 563.99 KiB | 789 KiB/s Receiving objects: 67% (4528/6758), 563.99 KiB | 789 KiB/s Receiving objects: 68% (4596/6758), 563.99 KiB | 789 KiB/s Receiving objects: 69% (4664/6758), 563.99 KiB | 789 KiB/s Receiving objects: 70% (4731/6758), 563.99 KiB | 789 KiB/s Receiving objects: 71% (4799/6758), 563.99 KiB | 789 KiB/s Receiving objects: 72% (4866/6758), 563.99 KiB | 789 KiB/s Receiving objects: 73% (4934/6758), 563.99 KiB | 789 KiB/s Receiving objects: 74% (5001/6758), 563.99 KiB | 789 KiB/s Receiving objects: 75% (5069/6758), 563.99 KiB | 789 KiB/s Receiving objects: 76% (5137/6758), 563.99 KiB | 789 KiB/s Receiving objects: 77% (5204/6758), 563.99 KiB | 789 KiB/s Receiving objects: 78% (5272/6758), 563.99 KiB | 789 KiB/s Receiving objects: 79% (5339/6758), 563.99 KiB | 789 KiB/s Receiving objects: 80% (5407/6758), 563.99 KiB | 789 KiB/s Receiving objects: 81% (5474/6758), 563.99 KiB | 789 KiB/s Receiving objects: 82% (5542/6758), 563.99 KiB | 789 KiB/s Receiving objects: 83% (5610/6758), 563.99 KiB | 789 KiB/s Receiving objects: 84% (5677/6758), 563.99 KiB | 789 KiB/s Receiving objects: 85% (5745/6758), 563.99 KiB | 789 KiB/s Receiving objects: 86% (5812/6758), 563.99 KiB | 789 KiB/s Receiving objects: 87% (5880/6758), 563.99 KiB | 789 KiB/s Receiving objects: 88% (5948/6758), 563.99 KiB | 789 KiB/s Receiving objects: 89% (6015/6758), 563.99 KiB | 789 KiB/s Receiving objects: 90% (6083/6758), 563.99 KiB | 789 KiB/s Receiving objects: 91% (6150/6758), 563.99 KiB | 789 KiB/s Receiving objects: 92% (6218/6758), 563.99 KiB | 789 KiB/s Receiving objects: 93% (6285/6758), 563.99 KiB | 789 KiB/s Receiving objects: 94% (6353/6758), 563.99 KiB | 789 KiB/s Receiving objects: 95% (6421/6758), 563.99 KiB | 789 KiB/s Receiving objects: 96% (6488/6758), 563.99 KiB | 789 KiB/s Receiving objects: 97% (6556/6758), 563.99 KiB | 789 KiB/s Receiving objects: 98% (6623/6758), 563.99 KiB | 789 KiB/s Receiving objects: 99% (6691/6758), 563.99 KiB | 789 KiB/s Receiving objects: 100% (6758/6758), 563.99 KiB | 789 KiB/s Receiving objects: 100% (6758/6758), 1.24 MiB | 789 KiB/s, done. remote: Total 6758 (delta 5688), reused 5492 (delta 4926) Resolving deltas: 0% (1/5688) Resolving deltas: 1% (57/5688) Resolving deltas: 2% (117/5688) Resolving deltas: 3% (174/5688) Resolving deltas: 4% (228/5688) Resolving deltas: 5% (301/5688) Resolving deltas: 6% (356/5688) Resolving deltas: 11% (652/5688) Resolving deltas: 12% (683/5688) Resolving deltas: 13% (742/5688) Resolving deltas: 14% (851/5688) Resolving deltas: 15% (876/5688) Resolving deltas: 17% (1001/5688) Resolving deltas: 23% (1342/5688) Resolving deltas: 24% (1400/5688) Resolving deltas: 25% (1459/5688) Resolving deltas: 32% (1845/5688) Resolving deltas: 33% (1903/5688) Resolving deltas: 34% (1942/5688) Resolving deltas: 37% (2141/5688) Resolving deltas: 38% (2164/5688) Resolving deltas: 40% (2308/5688) Resolving deltas: 42% (2430/5688) Resolving deltas: 43% (2462/5688) Resolving deltas: 46% (2669/5688) Resolving deltas: 47% (2700/5688) Resolving deltas: 49% (2804/5688) Resolving deltas: 52% (2999/5688) Resolving deltas: 53% (3029/5688) Resolving deltas: 54% (3119/5688) Resolving deltas: 55% (3129/5688) Resolving deltas: 56% (3198/5688) Resolving deltas: 57% (3281/5688) Resolving deltas: 58% (3315/5688) Resolving deltas: 59% (3356/5688) Resolving deltas: 60% (3414/5688) Resolving deltas: 61% (3518/5688) Resolving deltas: 62% (3533/5688) Resolving deltas: 63% (3595/5688) Resolving deltas: 64% (3647/5688) Resolving deltas: 65% (3699/5688) Resolving deltas: 66% (3758/5688) Resolving deltas: 67% (3826/5688) Resolving deltas: 68% (3892/5688) Resolving deltas: 69% (3925/5688) Resolving deltas: 70% (3982/5688) Resolving deltas: 71% (4059/5688) Resolving deltas: 72% (4133/5688) Resolving deltas: 73% (4175/5688) Resolving deltas: 74% (4210/5688) Resolving deltas: 75% (4271/5688) Resolving deltas: 76% (4355/5688) Resolving deltas: 77% (4404/5688) Resolving deltas: 78% (4439/5688) Resolving deltas: 79% (4518/5688) Resolving deltas: 80% (4577/5688) Resolving deltas: 81% (4614/5688) Resolving deltas: 82% (4674/5688) Resolving deltas: 83% (4733/5688) Resolving deltas: 84% (4802/5688) Resolving deltas: 85% (4887/5688) Resolving deltas: 86% (4906/5688) Resolving deltas: 87% (4967/5688) Resolving deltas: 89% (5100/5688) Resolving deltas: 90% (5120/5688) Resolving deltas: 91% (5178/5688) Resolving deltas: 93% (5330/5688) Resolving deltas: 94% (5390/5688) Resolving deltas: 95% (5404/5688) Resolving deltas: 96% (5467/5688) Resolving deltas: 97% (5568/5688) Resolving deltas: 98% (5575/5688) Resolving deltas: 99% (5637/5688) Resolving deltas: 100% (5688/5688) Resolving deltas: 100% (5688/5688), completed with 107 local objects. From /pub/scm/linux/kernel/git/avi/kvm cdc022c..3743888 master -> kvm Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/roland/infiniband d2532dd..6fdf5e6 for-linus -> infiniband-for-linus remote: Counting objects: 1083, done. remote: Compressing objects: 0% (1/126) remote: Compressing objects: 1% (2/126) remote: Compressing objects: 2% (3/126) remote: Compressing objects: 3% (4/126) remote: Compressing objects: 4% (6/126) remote: Compressing objects: 5% (7/126) remote: Compressing obje cremote: ts: 6% (8/126) remote: Compressing objects: 7% (9/126) remote: Compressing objects: 8% (11/126) remote: Compressing objects: 9% (12/12 6remote: ) remote: Compressing objects: 10% (13/126) remote: Compressing objects: 11% (14/126) remote: Compressing objects: 12% (16/126) remote: Compress iremote: ng objects: 13% (17/126) remote: Compressing objects: 14% (18/126) remote: Compressing objects: 15% (19/126) remote: Compressing objects: 1remote: 6% (21/126) remote: Compressing objects: 17% (22/126) remote: Compressing objects: 18% (23/126) remote: Compressing objects: 19% (24/126) remote: remote: Compressing objects: 20% (26/126) remote: Compressing objects: 21% (27/126) remote: Compressing objects: 22% (28/126) remote: Compressing oremote: bjects: 23% (29/126) remote: Compressing objects: 24% (31/126) remote: Compressing objects: 25% (32/126) remote: Compressing objects: 26% (remote: 33/126) remote: Compressing objects: 27% (35/126) remote: Compressing objects: 28% (36/126) remote: Compressing objects: 29% (37/126) remote: Co mremote: pressing objects: 30% (38/126) remote: Compressing objects: 31% (40/126) remote: Compressing objects: 32% (41/126) remote: Compressing obje cremote: ts: 33% (42/126) remote: Compressing objects: 34% (43/126) remote: Compressing objects: 35% (45/126) remote: Compressing objects: 36% (46/ 1remote: 26) remote: Compressing objects: 37% (47/126) remote: Compressing objects: 38% (48/126) remote: Compressing objects: 39% (50/126) remote: Compre sremote: sing objects: 40% (51/126) remote: Compressing objects: 41% (52/126) remote: Compressing objects: 42% (53/126) remote: Compressing objects: remote: 43% (55/126) remote: Compressing objects: 44% (56/126) remote: Compressing objects: 45% (57/126) remote: Compressing objects: 46% (58/126) remote: remote: Compressing objects: 47% (60/126) remote: Compressing objects: 48% (61/126) remote: Compressing objects: 49% (62/126) remote: Compressin gremote: objects: 50% (63/126) remote: Compressing objects: 51% (65/126) remote: Compressing objects: 52% (66/126) remote: Compressing objects: 53 %remote: (67/126) remote: Compressing objects: 54% (69/126) remote: Compressing objects: 55% (70/126) remote: Compressing objects: 56% (71/126) remote: Cremote: ompressing objects: 57% (72/126) remote: Compressing objects: 58% (74/126) remote: Compressing objects: 59% (75/126) remote: Compressing ob jremote: ects: 60% (76/126) remote: Compressing objects: 61% (77/126) remote: Compressing objects: 62% (79/126) remote: Compressing objects: 63% (8 0remote: /126) remote: Compressing objects: 64% (81/126) remote: Compressing objects: 65% (82/126) remote: Compressing objects: 66% (84/126) remote: Comp rremote: essing objects: 67% (85/126) remote: Compressing objects: 68% (86/126) remote: Compressing objects: 69% (87/126) remote: Compressing object sremote: : 70% (89/126) remote: Compressing objects: 71% (90/126) remote: Compressing objects: 72% (91/126) remote: Compressing objects: 73% (92/12 6remote: ) remote: Compressing objects: 74% (94/126) remote: Compressing objects: 75% (95/126) remote: Compressing objects: 76% (96/126) remote: Compress iremote: ng objects: 77% (98/126) remote: Compressing objects: 78% (99/126) remote: Compressing objects: 79% (100/126) remote: Compressing objects: remote: 80% (101/126) remote: Compressing objects: 81% (103/126) remote: Compressing objects: 82% (104/126) remote: Compressing objects: 83% (105/1 2remote: 6) remote: Compressing objects: 84% (106/126) remote: Compressing objects: 85% (108/126) remote: Compressing objects: 86% (109/126) remote: Comp rremote: essing objects: 87% (110/126) remote: Compressing objects: 88% (111/126) remote: Compressing objects: 89% (113/126) remote: Compressing obj eremote: cts: 90% (114/126) remote: Compressing objects: 91% (115/126) remote: Compressing objects: 92% (116/126) remote: Compressing objects: 93% (remote: 118/126) remote: Compressing objects: 94% (119/126) remote: Compressing objects: 95% (120/126) remote: Compressing objects: 96% (121/126) remote: remote: Compressing objects: 97% (123/126) remote: Compressing objects: 98% (124/126) remote: Compressing objects: 99% (125/126) remote: Compressi nremote: g objects: 100% (126/126) remote: Compressing objects: 100% (126/126), done. Receiving objects: 0% (1/940) Receiving objects: 1% (10/940) Receiving objects: 2% (19/940) Receiving objects: 3% (29/940) Receiving objects: 4% (38/940) Receiving objects: 5% (47/940) Receiving objects: 6% (57/940) Receiving objects: 7% (66/940) Receiving objects: 8% (76/940) Receiving objects: 9% (85/940) Receiving objects: 10% (94/940) Receiving objects: 11% (104/940) Receiving objects: 12% (113/940) Receiving objects: 13% (123/940) Receiving objects: 14% (132/940) Receiving objects: 15% (141/940) Receiving objects: 16% (151/940) Receiving objects: 17% (160/940) Receiving objects: 18% (170/940) Receiving objects: 19% (179/940) Receiving objects: 20% (188/940) Receiving objects: 21% (198/940) Receiving objects: 22% (207/940) Receiving objects: 23% (217/940) Receiving objects: 24% (226/940) Receiving objects: 25% (235/940) Receiving objects: 26% (245/940) Receiving objects: 27% (254/940) Receiving objects: 28% (264/940) remote: Total 940 (delta 821), reused 931 (delta 814) Receiving objects: 29% (273/940) Receiving objects: 30% (282/940) Receiving objects: 31% (292/940) Receiving objects: 32% (301/940) Receiving objects: 33% (311/940) Receiving objects: 34% (320/940) Receiving objects: 35% (329/940) Receiving objects: 36% (339/940) Receiving objects: 37% (348/940) Receiving objects: 38% (358/940) Receiving objects: 39% (367/940) Receiving objects: 40% (376/940) Receiving objects: 41% (386/940) Receiving objects: 42% (395/940) Receiving objects: 43% (405/940) Receiving objects: 44% (414/940) Receiving objects: 45% (423/940) Receiving objects: 46% (433/940) Receiving objects: 47% (442/940) Receiving objects: 48% (452/940) Receiving objects: 49% (461/940) Receiving objects: 50% (470/940) Receiving objects: 51% (480/940) Receiving objects: 52% (489/940) Receiving objects: 53% (499/940) Receiving objects: 54% (508/940) Receiving objects: 55% (517/940) Receiving objects: 56% (527/940) Receiving objects: 57% (536/940) Receiving objects: 58% (546/940) Receiving objects: 59% (555/940) Receiving objects: 60% (564/940) Receiving objects: 61% (574/940) Receiving objects: 62% (583/940) Receiving objects: 63% (593/940) Receiving objects: 64% (602/940) Receiving objects: 65% (611/940) Receiving objects: 66% (621/940) Receiving objects: 67% (630/940) Receiving objects: 68% (640/940) Receiving objects: 69% (649/940) Receiving objects: 70% (658/940) Receiving objects: 71% (668/940) Receiving objects: 72% (677/940) Receiving objects: 73% (687/940) Receiving objects: 74% (696/940) Receiving objects: 75% (705/940) Receiving objects: 76% (715/940) Receiving objects: 77% (724/940) Receiving objects: 78% (734/940) Receiving objects: 79% (743/940) Receiving objects: 80% (752/940) Receiving objects: 81% (762/940) Receiving objects: 82% (771/940) Receiving objects: 83% (781/940) Receiving objects: 84% (790/940) Receiving objects: 85% (799/940) Receiving objects: 86% (809/940) Receiving objects: 87% (818/940) Receiving objects: 88% (828/940) Receiving objects: 89% (837/940) Receiving objects: 90% (846/940) Receiving objects: 91% (856/940) Receiving objects: 92% (865/940) Receiving objects: 93% (875/940) Receiving objects: 94% (884/940) Receiving objects: 95% (893/940) Receiving objects: 96% (903/940) Receiving objects: 97% (912/940) Receiving objects: 98% (922/940) Receiving objects: 99% (931/940) Receiving objects: 100% (940/940) Receiving objects: 100% (940/940), 214.54 KiB, done. Resolving deltas: 0% (1/821) Resolving deltas: 1% (15/821) Resolving deltas: 2% (23/821) Resolving deltas: 3% (29/821) Resolving deltas: 7% (65/821) Resolving deltas: 8% (66/821) Resolving deltas: 9% (74/821) Resolving deltas: 12% (101/821) Resolving deltas: 15% (124/821) Resolving deltas: 16% (139/821) Resolving deltas: 20% (168/821) Resolving deltas: 24% (201/821) Resolving deltas: 26% (217/821) Resolving deltas: 38% (314/821) Resolving deltas: 49% (409/821) Resolving deltas: 51% (419/821) Resolving deltas: 52% (428/821) Resolving deltas: 53% (436/821) Resolving deltas: 54% (445/821) Resolving deltas: 55% (452/821) Resolving deltas: 56% (460/821) Resolving deltas: 57% (471/821) Resolving deltas: 58% (478/821) Resolving deltas: 59% (485/821) Resolving deltas: 60% (500/821) Resolving deltas: 61% (505/821) Resolving deltas: 62% (512/821) Resolving deltas: 64% (528/821) Resolving deltas: 65% (538/821) Resolving deltas: 66% (542/821) Resolving deltas: 67% (551/821) Resolving deltas: 68% (564/821) Resolving deltas: 70% (582/821) Resolving deltas: 71% (587/821) Resolving deltas: 72% (593/821) Resolving deltas: 73% (602/821) Resolving deltas: 74% (610/821) Resolving deltas: 75% (618/821) Resolving deltas: 76% (625/821) Resolving deltas: 77% (637/821) Resolving deltas: 78% (641/821) Resolving deltas: 79% (649/821) Resolving deltas: 80% (659/821) Resolving deltas: 81% (667/821) Resolving deltas: 82% (674/821) Resolving deltas: 83% (683/821) Resolving deltas: 84% (690/821) Resolving deltas: 85% (699/821) Resolving deltas: 86% (707/821) Resolving deltas: 87% (718/821) Resolving deltas: 88% (726/821) Resolving deltas: 89% (736/821) Resolving deltas: 90% (743/821) Resolving deltas: 91% (748/821) Resolving deltas: 93% (765/821) Resolving deltas: 94% (774/821) Resolving deltas: 95% (782/821) Resolving deltas: 96% (789/821) Resolving deltas: 98% (808/821) Resolving deltas: 99% (814/821) Resolving deltas: 100% (821/821) Resolving deltas: 100% (821/821), completed with 139 local objects. From /pub/scm/linux/kernel/git/roland/infiniband + 9d13479...af3a120 for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. www.linux-mips.org[0: 84.159.122.18]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips' not found. www.linux-mips.org[0: 84.159.122.18]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips-devel' not found. Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel * [new branch] master -> sched fatal: 'revert': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly Already on branch "2.6.25-rc8-mc8" From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + d74703c...f8e4851 master -> x86 (forced update) Switched to branch "x86" Finished one revert. Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/aegl/linux-2.6 9597362..e315c12 release -> ia64-release fatal: Not a valid object name: '2.6.25-rc8'. Switched to branch "doc" Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Switched to branch "m68k" .dotest/patch:353: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:382: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:404: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use .dotest/patch:426: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use warning: 4 lines add whitespace errors. .dotest/patch:868: space before tab in indent. break; .dotest/patch:870: space before tab in indent. } while (--poll_count); .dotest/patch:875: space before tab in indent. if (!poll_count) { .dotest/patch:880: space before tab in indent. } else { .dotest/patch:1631: space before tab in indent. shouldn't this be a given if we have it here ? */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. Already on branch "2.6.25-rc8-mc8" Automatic merge failed; fix conflicts and then commit the result. | 38 +- drivers/ide/pci/sgiioc4.c | 152 ++-- drivers/ide/pci/siimage.c | 177 ++--- drivers/ide/pci/sis5513.c | 253 +++--- drivers/ide/pci/sl82c105.c | 87 +- drivers/ide/pci/slc90e66.c | 22 +- drivers/ide/pci/tc86c001.c | 90 +-- drivers/ide/pci/triflex.c | 12 +- drivers/ide/pci/trm290.c | 47 +- drivers/ide/pci/via82cxxx.c | 20 +- drivers/ide/ppc/mpc8xx.c | 142 ++-- drivers/ide/ppc/pmac.c | 281 +++--- drivers/ide/setup-pci.c | 227 ++--- drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 208 ++--- include/asm-alpha/ide.h | 11 - include/asm-arm/arch-sa1100/ide.h | 6 +- include/asm-arm/ide.h | 8 - include/asm-blackfin/ide.h | 4 - include/asm-cris/arch-v10/ide.h | 11 +- include/asm-ia64/ide.h | 10 - include/asm-m32r/ide.h | 10 - include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - include/asm-mips/mach-generic/ide.h | 10 - include/asm-parisc/ide.h | 2 - include/asm-powerpc/ide.h | 57 +- include/asm-powerpc/mediabay.h | 6 +- include/asm-sh/ide.h | 3 - include/asm-sparc/ide.h | 2 - include/asm-sparc64/ide.h | 2 - include/asm-x86/ide.h | 10 - include/linux/Kbuild | 1 - include/linux/hdreg.h | 4 +- include/linux/hdsmart.h | 126 --- include/linux/ide.h | 396 +++++---- 141 files changed, 4524 insertions(+), 7174 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt create mode 100644 drivers/ide/legacy/ide-4drives.c delete mode 100644 include/linux/hdsmart.h ## # gitfetch /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 gregkh-driver scsi-driverbase ## ## # gitfetch /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 gregkh-driver-base scsi-driverbase-base ## ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/. gregkh-driver ## building file list ... done ./ README block-send-disk-change-event-for-rescan_partitions.patch driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch driver-core-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch driver-core-make-device_is_registered-work-for-class-devices.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-remove-no-longer-used-struct-class_device.patch driver-core-replace-remaining-__function__-occurrences.patch drm-remove-unused-dev_class.patch firmware-clean-up-samples-for-coding-style-issues.patch firmware-move-firmware_class-from-documentation-to-samples.patch ib-convert-struct-class_device-to-struct-device.patch ib-rename-dev-to-srp_dev-in-srp_host-structure.patch kobject-catch-kobjects-that-are-not-initialized.patch kobject-replace-list_for_each-with-list_for_each_entry.patch memstick-convert-struct-class_device-to-struct-device.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch pm-convert-wakeup-flag-accessors-to-inline-functions.patch pm-fix-misuse-of-wakeup-flag-accessors-in-serial-core.patch pm-handle-device-registrations-during-suspend-resume.patch pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch pm-remove-legacy-pm.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch put_device-might_sleep.patch scsi-convert-struct-class_device-to-struct-device.patch series sysdev-detect-multiple-driver-registrations.patch sysfs-crash-debugging.patch sysfs-explicitly-include-required-header-file-slab.h.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-implement-a-uio-interface-for-the-smx-cryptengine.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch warn-when-statically-allocated-kobjects-are-used.patch sent 502811 bytes received 884 bytes 1007390.00 bytes/sec total size is 497846 speedup is 0.99 2.6.25-rc8-git2 to 9597362d354f8655ece324b01d0c640a0e99c077 Using base 9597362d354f8655ece324b01d0c640a0e99c077 kobject-catch-kobjects-that-are-not-initialized.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch uio-implement-a-uio-interface-for-the-smx-cryptengine.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch firmware-move-firmware_class-from-documentation-to-samples.patch firmware-clean-up-samples-for-coding-style-issues.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch sysdev-detect-multiple-driver-registrations.patch block-send-disk-change-event-for-rescan_partitions.patch pm-handle-device-registrations-during-suspend-resume.patch driver-core-call-device_pm_add-after-bus_add_device-in-device_add.patch pm-fix-misuse-of-wakeup-flag-accessors-in-serial-core.patch pm-make-wakeup-flags-available-whenever-config_pm-is-set.patch pm-convert-wakeup-flag-accessors-to-inline-functions.patch driver-core-make-device_is_registered-work-for-class-devices.patch sysfs-explicitly-include-required-header-file-slab.h.patch kobject-replace-list_for_each-with-list_for_each_entry.patch pm-remove-legacy-pm.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch driver-core-replace-remaining-__function__-occurrences.patch memstick-convert-struct-class_device-to-struct-device.patch ib-convert-struct-class_device-to-struct-device.patch ib-rename-dev-to-srp_dev-in-srp_host-structure.patch drm-remove-unused-dev_class.patch scsi-convert-struct-class_device-to-struct-device.patch driver-core-remove-no-longer-used-struct-class_device.patch put_device-might_sleep.patch warn-when-statically-allocated-kobjects-are-used.patch ## # quiltstable gregkh-driver scsi-driverbase scsi-driverbase-base ## Created commit 06d1679: Revert "warn when statically-allocated kobjects are used" 3 files changed, 0 insertions(+), 62 deletions(-) Created commit 6a322d5: Revert "Make put_device() warn that it will sleep" 1 files changed, 0 insertions(+), 1 deletions(-) Created commit 4ba75d3: Revert "driver core: remove no longer used "struct class_device"" 3 files changed, 745 insertions(+), 1 deletions(-) Created commit 4821741: Revert "SCSI: convert struct class_device to struct device" 55 files changed, 1505 insertions(+), 1755 deletions(-) Created commit bf7e409: Revert "DRM: remove unused dev_class" 1 files changed, 1 insertions(+), 0 deletions(-) Created commit bf618d8: Revert "IB: rename "dev" to "srp_dev" in srp_host structure" 2 files changed, 24 insertions(+), 27 deletions(-) Created commit 626cfe8: Revert "IB: convert struct class_device to struct device" 15 files changed, 319 insertions(+), 352 deletions(-) Created commit a9b4485: Revert "memstick: convert struct class_device to struct device" 4 files changed, 28 insertions(+), 27 deletions(-) Created commit fa72671: Revert "driver core: replace remaining __FUNCTION__ occurrences" 7 files changed, 36 insertions(+), 36 deletions(-) Created commit 5ad8245: Revert "NET: convert the phy_device file to use bus_find_device_by_name" 1 files changed, 7 insertions(+), 1 deletions(-) Created commit 146d780: Revert "PM: Remove legacy PM (fix)" 1 files changed, 5 insertions(+), 0 deletions(-) Created commit e7360c3: Revert "Kobject: Replace list_for_each() with list_for_each_entry()." 1 files changed, 8 insertions(+), 2 deletions(-) Created commit cd4031b: Revert "SYSFS: Explicitly include required header file slab.h." 2 files changed, 0 insertions(+), 2 deletions(-) Created commit 1ed3eb4: Revert "Driver core: make device_is_registered() work for class devices" 2 files changed, 9 insertions(+), 3 deletions(-) Removed include/linux/pm_wakeup.h Created commit a07e3a6: Revert "PM: Convert wakeup flag accessors to inline functions" 3 files changed, 45 insertions(+), 94 deletions(-) delete mode 100644 include/linux/pm_wakeup.h Created commit 4f17fbe: Revert "PM: Make wakeup flags available whenever CONFIG_PM is set" 3 files changed, 17 insertions(+), 23 deletions(-) Created commit 5959384: Revert "PM: Fix misuse of wakeup flag accessors in serial core" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit 85ae168: Revert "Driver core: Call device_pm_add() after bus_add_device() in device_add()" 2 files changed, 11 insertions(+), 8 deletions(-) Created commit 5c9a750: Revert "PM: Handle device registrations during suspend/resume" 5 files changed, 52 insertions(+), 40 deletions(-) Created commit a89df5b: Revert "block: send disk "change" event for rescan_partitions()" 1 files changed, 0 insertions(+), 4 deletions(-) Created commit 4529744: Revert "sysdev: detect multiple driver registrations" 1 files changed, 0 insertions(+), 16 deletions(-) Created commit 79e5460: Revert "driver core: cpu: fix section mismatch in cpu.c:store_online" 1 files changed, 2 insertions(+), 2 deletions(-) Created commit d195f14: Revert "power_state: remove it from driver core" 1 files changed, 5 insertions(+), 0 deletions(-) Created commit 6f918e4: Revert "PNP: add all PNP card device id's as individual aliases" 1 files changed, 13 insertions(+), 44 deletions(-) Created commit cd57e1a: Revert "firmware: clean up samples for coding style issues" 2 files changed, 38 insertions(+), 40 deletions(-) Created commit c2f98a5: Revert "firmware: move firmware_class from Documentation/ to samples/" 2 files changed, 6 insertions(+), 6 deletions(-) rename {samples => Documentation}/firmware_class/firmware_sample_driver.c (99%) rename {samples => Documentation}/firmware_class/firmware_sample_firmware_class.c (99%) Created commit 1dcee4f: Revert "sysfs: small header file cleanup for SYSFS=n" 1 files changed, 7 insertions(+), 2 deletions(-) Created commit eb9f7e2: Revert "driver core: Convert debug functions declared inline __attribute__((format (printf,x,y) to statement expression macros" 2 files changed, 14 insertions(+), 7 deletions(-) Created commit 7cc65c0: Revert "driver core: register_memory/unregister_memory clean ups and bugfix" 1 files changed, 15 insertions(+), 7 deletions(-) Created commit 58c1f7e: Revert "driver core: memory: semaphore to mutex" 3 files changed, 7 insertions(+), 7 deletions(-) Removed drivers/uio/uio_smx.c Created commit dc4f525: Revert "UIO: Implement a UIO interface for the SMX Cryptengine" 4 files changed, 0 insertions(+), 159 deletions(-) delete mode 100644 drivers/uio/uio_smx.c Created commit 4f39713: Revert "UIO: Remove needless PCI_DEVICE_ID definition from uio_cif.c" 1 files changed, 4 insertions(+), 0 deletions(-) Created commit 8a8c984: Revert "UIO: arch/arm/Kconfig: Make UIO available on ARM architecture" 1 files changed, 0 insertions(+), 2 deletions(-) Created commit dcca6b5: Revert "uio: mark pci_device_id hilscher_pci_ids[] __devinitdata" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit a1f5a60: Revert "uio: Kconfig improvements" 1 files changed, 5 insertions(+), 5 deletions(-) Created commit 7c19e8d: Revert "kobject: catch kobjects that are not initialized" 1 files changed, 1 insertions(+), 8 deletions(-) Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 ++-- drivers/base/base.h | 11 - drivers/base/bus.c | 17 +- drivers/base/class.c | 640 +------------------- drivers/base/core.c | 30 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 66 +-- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/infiniband/core/sysfs.c | 76 ++-- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 ++-- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 +++--- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++-- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 +++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 +++-- drivers/scsi/lpfc/lpfc_attr.c | 484 ++++++++------- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 13 +- drivers/scsi/ncr53c8xx.c | 7 +- drivers/scsi/osst.c | 76 ++-- drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- drivers/scsi/qla2xxx/qla_attr.c | 177 +++--- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/raid_class.c | 73 ++-- drivers/scsi/scsi_sas_internal.h | 24 +- drivers/scsi/scsi_sysfs.c | 150 +++-- drivers/scsi/scsi_transport_fc.c | 385 +++++++------ drivers/scsi/scsi_transport_iscsi.c | 107 ++-- drivers/scsi/scsi_transport_sas.c | 157 +++--- drivers/scsi/scsi_transport_spi.c | 185 +++--- drivers/scsi/scsi_transport_srp.c | 26 +- drivers/scsi/sd.c | 78 ++- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 ++- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 113 files changed, 2715 insertions(+), 2901 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # merge gregkh-driver ## Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/ch.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/raid_class.c Auto-merged drivers/scsi/st.c Auto-merged include/linux/attribute_container.h Auto-merged include/linux/libata.h Auto-merged include/linux/transport_class.h Auto-merged include/scsi/scsi_host.h Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 ++-- drivers/base/base.h | 11 - drivers/base/bus.c | 17 +- drivers/base/class.c | 640 +------------------- drivers/base/core.c | 30 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 66 +-- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/infiniband/core/sysfs.c | 76 ++-- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 ++-- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 +++--- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++-- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 +++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 +++-- drivers/scsi/lpfc/lpfc_attr.c | 484 ++++++++------- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 13 +- drivers/scsi/ncr53c8xx.c | 7 +- drivers/scsi/osst.c | 76 ++-- drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- drivers/scsi/qla2xxx/qla_attr.c | 177 +++--- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/raid_class.c | 73 ++-- drivers/scsi/scsi_sas_internal.h | 24 +- drivers/scsi/scsi_sysfs.c | 150 +++-- drivers/scsi/scsi_transport_fc.c | 385 +++++++------ drivers/scsi/scsi_transport_iscsi.c | 107 ++-- drivers/scsi/scsi_transport_sas.c | 157 +++--- drivers/scsi/scsi_transport_spi.c | 185 +++--- drivers/scsi/scsi_transport_srp.c | 26 +- drivers/scsi/sd.c | 78 ++- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 ++- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 113 files changed, 2715 insertions(+), 2901 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-generic-pci_enable_resources.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-add-pci-express-aspm-support.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-clean-up-resource-alignment-management.patch pci-clean-up-search.c-a-lot.patch pci-cris-use-generic-pci_enable_resources.patch pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-expose-pci-vpd-through-sysfs.patch pci-frv-use-generic-pci_enable_resources.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-ia64-use-generic-pci_enable_resources.patch pci-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-iommu-iotlb-flushing.patch pci-iova-rb-tree-setup-tweak.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-update-via-cx700-quirk.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch series sent 449395 bytes received 1038 bytes 900866.00 bytes/sec total size is 444040 speedup is 0.99 Using base gregkh-driver pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch pci-update-via-cx700-quirk.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-clean-up-resource-alignment-management.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit a2b3b48: Resolve Patch: /home/jejb/gregkh-pci-fixup.diff ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch ub-drop-bug-and-update-small-things.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-usb-serial-spcp8x5-driver.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-ftdi_sio-note-missing-locking.patch usb-g_printer-bugfixes.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-increase-cdc-acm-write-throughput.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-serial-remove-obsolete-contact-addresses.patch usb-serial-sierra-c597-fix.patch usb-serial-sierra-clean-up.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-usb.h-reduce-syslog-clutter.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-use-div_round_up.patch usbmon-restore-mmap.patch sent 1160498 bytes received 1764 bytes 332074.86 bytes/sec total size is 1150941 speedup is 0.99 Using base gregkh-pci usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-cypress_m8-speed-handling.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch usb-usb.h-reduce-syslog-clutter.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch ub-drop-bug-and-update-small-things.patch usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-serial-sierra-clean-up.patch usb-serial-sierra-c597-fix.patch usb-add-usb-serial-spcp8x5-driver.patch u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-serial-remove-obsolete-contact-addresses.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-g_printer-bugfixes.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- Documentation/usb/usb-serial.txt | 7 +- drivers/block/ub.c | 76 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.c | 2 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/amd5536udc.c | 10 + drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 28 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 92 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 10 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 5139 ++++++++++++------------- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 20 +- drivers/usb/misc/adutux.c | 120 +- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 +- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 +- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 +- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++-- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 +- drivers/usb/serial/garmin_gps.c | 112 +- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 +- drivers/usb/serial/io_ti.c | 392 +- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 +- drivers/usb/serial/keyspan.c | 262 +- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 +- drivers/usb/serial/mos7840.c | 159 +- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 +- drivers/usb/serial/pl2303.c | 112 +- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 83 +- drivers/usb/serial/spcp8x5.c | 1075 ++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +- drivers/usb/serial/usb-serial.c | 89 +- drivers/usb/serial/visor.c | 92 +- drivers/usb/serial/whiteheat.c | 110 +- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 + drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 26 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 5 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 1 + 160 files changed, 7288 insertions(+), 5819 deletions(-) create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/. gregkh-ldp base gregkh-usb ## building file list ... done ./ README add-me4000-pci-data-collection-driver.patch aectc-add-the-aectc-driver.patch dvb-add-firesat-driver.patch input-add-appleir-driver.patch net-add-alacritech-slicoss-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch series usb-add-sensoray-2255-v4l-driver.patch video-add-the-go7007-driver.patch sent 7494770 bytes received 246 bytes 14990032.00 bytes/sec total size is 7492758 speedup is 1.00 Using base gregkh-usb usb-add-sensoray-2255-v4l-driver.patch dvb-add-firesat-driver.patch video-add-the-go7007-driver.patch net-add-alacritech-slicoss-driver.patch input-add-appleir-driver.patch add-me4000-pci-data-collection-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## BRANCH agp-patches not in tree /pub/scm/linux/kernel/git/airlied/agp-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/misc/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 26 files changed, 1267 insertions(+), 764 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/CHANGES | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/powerpc/kernel/process.c Auto-merged arch/powerpc/kernel/rtas_flash.c Auto-merged arch/powerpc/kernel/setup_32.c Auto-merged arch/powerpc/oprofile/cell/vma_map.c Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c Auto-merged arch/powerpc/sysdev/cpm2.c Auto-merged arch/ppc/platforms/radstone_ppc7d.c Merge made by recursive. Documentation/kernel-parameters.txt | 2 + Documentation/powerpc/booting-without-of.txt | 16 - Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ arch/powerpc/Kconfig | 14 + arch/powerpc/boot/Makefile | 4 +- arch/powerpc/boot/bamboo.c | 3 +- arch/powerpc/boot/cuboot-rainier.c | 3 +- arch/powerpc/boot/cuboot-sequoia.c | 3 +- arch/powerpc/boot/cuboot-taishan.c | 3 +- arch/powerpc/boot/cuboot-warp.c | 2 +- arch/powerpc/boot/cuboot-yosemite.c | 44 + arch/powerpc/boot/dts/bamboo.dts | 2 - arch/powerpc/boot/dts/canyonlands.dts | 391 +++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/glacier.dts | 464 +++++++++++ arch/powerpc/boot/dts/haleakala.dts | 2 +- arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++ arch/powerpc/boot/dts/rainier.dts | 2 - arch/powerpc/boot/dts/sequoia.dts | 2 - arch/powerpc/boot/dts/taishan.dts | 27 +- arch/powerpc/boot/dts/walnut.dts | 1 - arch/powerpc/boot/dts/warp.dts | 1 - arch/powerpc/boot/dts/yosemite.dts | 304 +++++++ arch/powerpc/boot/ebony.c | 3 +- arch/powerpc/boot/libfdt-wrapper.c | 2 +- arch/powerpc/boot/ps3-head.S | 25 +- arch/powerpc/boot/ps3.c | 23 +- arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/boot/wrapper | 23 +- arch/powerpc/configs/canyonlands_defconfig | 721 +++++++++++++++++ arch/powerpc/configs/ksi8560_defconfig | 899 +++++++++++++++++++++ arch/powerpc/configs/maple_defconfig | 131 +++- arch/powerpc/kernel/asm-offsets.c | 4 - arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 - arch/powerpc/kernel/ibmebus.c | 12 +- arch/powerpc/kernel/iommu.c | 4 +- arch/powerpc/kernel/isa-bridge.c | 2 +- arch/powerpc/kernel/lparcfg.c | 12 +- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 2 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 61 ++- arch/powerpc/kernel/rtas.c | 4 +- arch/powerpc/kernel/rtas_flash.c | 2 +- arch/powerpc/kernel/rtas_pci.c | 10 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_32.c | 12 + arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/kernel/vio.c | 10 +- arch/powerpc/math-emu/fabs.c | 2 +- arch/powerpc/math-emu/fadd.c | 2 +- arch/powerpc/math-emu/fadds.c | 2 +- arch/powerpc/math-emu/fcmpo.c | 2 +- arch/powerpc/math-emu/fcmpu.c | 2 +- arch/powerpc/math-emu/fctiw.c | 2 +- arch/powerpc/math-emu/fctiwz.c | 2 +- arch/powerpc/math-emu/fdiv.c | 6 +- arch/powerpc/math-emu/fdivs.c | 6 +- arch/powerpc/math-emu/fmadd.c | 2 +- arch/powerpc/math-emu/fmadds.c | 2 +- arch/powerpc/math-emu/fmr.c | 2 +- arch/powerpc/math-emu/fmsub.c | 2 +- arch/powerpc/math-emu/fmsubs.c | 2 +- arch/powerpc/math-emu/fmul.c | 2 +- arch/powerpc/math-emu/fmuls.c | 2 +- arch/powerpc/math-emu/fnabs.c | 2 +- arch/powerpc/math-emu/fneg.c | 2 +- arch/powerpc/math-emu/fnmadd.c | 2 +- arch/powerpc/math-emu/fnmadds.c | 2 +- arch/powerpc/math-emu/fnmsub.c | 2 +- arch/powerpc/math-emu/fnmsubs.c | 2 +- arch/powerpc/math-emu/fres.c | 2 +- arch/powerpc/math-emu/frsp.c | 2 +- arch/powerpc/math-emu/frsqrte.c | 2 +- arch/powerpc/math-emu/fsel.c | 2 +- arch/powerpc/math-emu/fsqrt.c | 2 +- arch/powerpc/math-emu/fsqrts.c | 2 +- arch/powerpc/math-emu/fsub.c | 2 +- arch/powerpc/math-emu/fsubs.c | 2 +- arch/powerpc/math-emu/lfd.c | 2 +- arch/powerpc/math-emu/lfs.c | 2 +- arch/powerpc/math-emu/mcrfs.c | 4 +- arch/powerpc/math-emu/mffs.c | 2 +- arch/powerpc/math-emu/mtfsb0.c | 2 +- arch/powerpc/math-emu/mtfsb1.c | 2 +- arch/powerpc/math-emu/mtfsf.c | 2 +- arch/powerpc/math-emu/mtfsfi.c | 2 +- arch/powerpc/math-emu/stfd.c | 2 +- arch/powerpc/math-emu/stfiwx.c | 2 +- arch/powerpc/math-emu/stfs.c | 2 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 30 +- arch/powerpc/mm/init_32.c | 4 +- arch/powerpc/mm/init_64.c | 4 +- arch/powerpc/mm/mem.c | 5 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +- arch/powerpc/oprofile/cell/vma_map.c | 10 +- arch/powerpc/oprofile/op_model_cell.c | 14 +- arch/powerpc/platforms/44x/Kconfig | 28 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/canyonlands.c | 64 ++ arch/powerpc/platforms/52xx/lite5200.c | 4 +- arch/powerpc/platforms/85xx/Kconfig | 7 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ksi8560.c | 257 ++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/cell/iommu.c | 10 +- arch/powerpc/platforms/cell/pervasive.c | 2 +- arch/powerpc/platforms/cell/ras.c | 10 +- arch/powerpc/platforms/cell/spu_base.c | 8 +- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/powerpc/platforms/cell/spu_manage.c | 8 +- arch/powerpc/platforms/cell/spufs/file.c | 4 +- arch/powerpc/platforms/cell/spufs/run.c | 10 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +- arch/powerpc/platforms/iseries/pci.c | 3 +- arch/powerpc/platforms/maple/pci.c | 47 -- arch/powerpc/platforms/maple/setup.c | 4 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/device-init.c | 78 ++- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/ps3/setup.c | 14 +- arch/powerpc/platforms/ps3/spu.c | 7 + arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++ arch/powerpc/platforms/pseries/reconfig.c | 12 +- arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 +- arch/powerpc/sysdev/ppc4xx_pci.c | 127 +++- arch/powerpc/sysdev/ppc4xx_pci.h | 59 ++ arch/powerpc/sysdev/ppc4xx_soc.c | 189 +++++ arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +- arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +- arch/powerpc/sysdev/tsi108_dev.c | 4 +- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/8xx_io/fec.c | 4 +- arch/ppc/kernel/head.S | 17 - arch/ppc/mm/init.c | 1 - arch/ppc/platforms/radstone_ppc7d.c | 8 +- arch/sparc64/Kconfig | 1 + drivers/block/viodasd.c | 2 +- drivers/char/xilinx_hwicap/buffer_icap.c | 22 +- drivers/char/xilinx_hwicap/buffer_icap.h | 5 +- drivers/char/xilinx_hwicap/fifo_icap.c | 31 +- drivers/char/xilinx_hwicap/fifo_icap.h | 1 + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 63 +- drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 ++++++-- drivers/net/pasemi_mac.h | 35 +- drivers/net/pasemi_mac_ethtool.c | 159 ++++ drivers/net/ps3_gelic_net.c | 81 ++ drivers/net/ps3_gelic_net.h | 20 + drivers/ps3/ps3-sys-manager.c | 74 ++- drivers/ps3/sys-manager-core.c | 16 +- include/asm-powerpc/Kbuild | 2 +- include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/dcr-native.h | 17 + include/asm-powerpc/dcr-regs.h | 78 ++ include/asm-powerpc/lmb.h | 82 +-- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 ++- include/asm-powerpc/phyp_dump.h | 45 + include/asm-powerpc/ps3.h | 7 +- include/asm-powerpc/sparsemem.h | 1 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 ++ lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++-- 195 files changed, 6424 insertions(+), 733 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt create mode 100644 arch/powerpc/boot/cuboot-yosemite.c create mode 100644 arch/powerpc/boot/dts/canyonlands.dts create mode 100644 arch/powerpc/boot/dts/glacier.dts create mode 100644 arch/powerpc/boot/dts/ksi8560.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/configs/ksi8560_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 9 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 2 +- drivers/media/Makefile | 3 + drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 53 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/Kconfig | 3 + drivers/media/dvb/b2c2/Makefile | 1 + drivers/media/dvb/b2c2/flexcop-common.h | 17 +- drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 161 ++- drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- drivers/media/dvb/b2c2/flexcop-misc.c | 2 + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/b2c2/flexcop-reg.h | 2 + drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- drivers/media/dvb/b2c2/flexcop.c | 10 +- drivers/media/dvb/bt8xx/Kconfig | 2 +- drivers/media/dvb/bt8xx/Makefile | 5 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 14 +- drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- drivers/media/dvb/dvb-core/demux.h | 2 + drivers/media/dvb/dvb-core/dmxdev.c | 10 +- drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 1 + drivers/media/dvb/dvb-usb/cxusb.c | 13 +- drivers/media/dvb/dvb-usb/dib0700.h | 4 + drivers/media/dvb/dvb-usb/dib0700_core.c | 4 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- drivers/media/dvb/dvb-usb/ttusb2.c | 62 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/cx24113.h | 48 + drivers/media/dvb/frontends/cx24123.c | 304 +++-- drivers/media/dvb/frontends/cx24123.h | 21 +- drivers/media/dvb/frontends/dvb-pll.c | 260 +--- drivers/media/dvb/frontends/dvb-pll.h | 31 +- drivers/media/dvb/frontends/isl6405.c | 164 ++ drivers/media/dvb/frontends/isl6405.h | 74 + drivers/media/dvb/frontends/lgdt330x.c | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 4 +- drivers/media/dvb/frontends/s5h1420.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 12 +- drivers/media/dvb/frontends/tda1004x.h | 1 - drivers/media/dvb/frontends/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 57 +- drivers/media/dvb/frontends/tda18271-fe.c | 418 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 16 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 23 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 167 +- drivers/media/dvb/frontends/tda827x.h | 4 +- drivers/media/dvb/frontends/ves1x93.c | 2 +- drivers/media/dvb/frontends/xc5000.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- drivers/media/radio/dsbr100.c | 2 + drivers/media/radio/miropcm20-radio.c | 2 + drivers/media/radio/miropcm20-rds.c | 2 +- drivers/media/radio/radio-aimslab.c | 2 + drivers/media/radio/radio-aztech.c | 2 + drivers/media/radio/radio-cadet.c | 12 +- drivers/media/radio/radio-gemtek-pci.c | 2 + drivers/media/radio/radio-gemtek.c | 2 + drivers/media/radio/radio-maestro.c | 2 + drivers/media/radio/radio-maxiradio.c | 2 + drivers/media/radio/radio-rtrack2.c | 2 + drivers/media/radio/radio-sf16fmi.c | 2 + drivers/media/radio/radio-sf16fmr2.c | 104 +- drivers/media/radio/radio-si470x.c | 59 +- drivers/media/radio/radio-terratec.c | 2 + drivers/media/radio/radio-trust.c | 2 + drivers/media/radio/radio-typhoon.c | 4 +- drivers/media/radio/radio-zoltrix.c | 2 + drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 9 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 6 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bt832.c | 12 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 33 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 3 + drivers/media/video/bt8xx/bttvp.h | 1 - drivers/media/video/bw-qcam.c | 6 +- drivers/media/video/c-qcam.c | 6 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia.c | 2 + drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cpia2/cpia2_v4l.c | 2 + drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 15 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-core.c | 91 +- drivers/media/video/cx25840/cx25840-core.h | 2 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx25840/cx25840-vbi.c | 6 +- drivers/media/video/cx88/Kconfig | 1 + drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 10 +- drivers/media/video/cx88/cx88-cards.c | 583 ++++++- drivers/media/video/cx88/cx88-core.c | 13 +- drivers/media/video/cx88/cx88-dvb.c | 245 +++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 9 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 63 +- drivers/media/video/cx88/cx88.h | 14 +- drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 4 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 26 +- drivers/media/video/ivtv/ivtv-cards.c | 7 +- drivers/media/video/ivtv/ivtv-cards.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 44 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-queue.c | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 14 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 7 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 844 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/ov511.c | 2 + drivers/media/video/pms.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 87 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- drivers/media/video/pwc/pwc-if.c | 10 +- drivers/media/video/pxa_camera.c | 985 +++++++++++ drivers/media/video/saa5249.c | 2 + drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 4 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/Kconfig | 1 + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 366 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 20 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 6 +- drivers/media/video/sn9c102/sn9c102_core.c | 12 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 6 +- drivers/media/video/stv680.c | 11 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 861 ++++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 57 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 8 +- drivers/media/video/usbvideo/vicam.c | 2 + drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 168 ++- drivers/media/video/videobuf-dma-sg.c | 137 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 49 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vivi.c | 334 ++--- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 6 +- drivers/media/video/w9968cf.c | 4 +- drivers/media/video/zc0301/zc0301_core.c | 4 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_card.h | 2 + drivers/media/video/zoran_device.c | 12 +- drivers/media/video/zoran_driver.c | 4 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 55 +- include/media/ir-common.h | 1 + include/media/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 9 +- include/media/videobuf-dma-sg.h | 14 +- 260 files changed, 11041 insertions(+), 3574 deletions(-) create mode 100644 drivers/media/dvb/frontends/cx24113.h create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## 2.6.25-rc8-git3 to e315c121a858499d84dc88c499046b9f10bb61ec Using base e315c121a858499d84dc88c499046b9f10bb61ec i2c-new-co-maintainer.patch i2c-ibm_iic-fast-mode-parm-desc-fixup.patch i2c-davinci-01-fix-lost-interrupt.patch i2c-tiny-usb-new-vid-pid-pair.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-bfin-twi-01-add-repeated-start.patch i2c-bfin-twi-02-support-multiport-controllers.patch i2c-bfin-twi-03-add-pin-mux-operation.patch i2c-bfin-twi-04-driver-description.patch i2c-bfin-twi-05-use-simpler-comment-headers.patch i2c-bfin-twi-06-add-ADSP-BF52x-support.patch i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch i2c-scx200_acb-dont-use-0-as-null-pointer.patch ## # merge i2c ## Auto-merged MAINTAINERS Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. MAINTAINERS | 2 + drivers/i2c/algos/Kconfig | 39 +-- drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 63 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-bfin-twi.c | 474 +++++++++++++++++---------- drivers/i2c/busses/i2c-davinci.c | 23 +- drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-tiny-usb.c | 12 +- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/isp1301_omap.c | 28 +- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + 24 files changed, 1790 insertions(+), 590 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 6 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 24 +++- drivers/hid/usbhid/Kconfig | 8 + drivers/hid/usbhid/Makefile | 3 + drivers/hid/usbhid/hid-core.c | 65 +++++---- drivers/hid/usbhid/hid-ff.c | 3 + drivers/hid/usbhid/hid-lg2ff.c | 114 ++++++++++++++++ drivers/hid/usbhid/hid-quirks.c | 55 ++++++++- drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- drivers/hid/usbhid/usbhid.h | 3 +- include/linux/hid.h | 14 ++- 12 files changed, 407 insertions(+), 176 deletions(-) create mode 100644 drivers/hid/usbhid/hid-lg2ff.c ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 10 + drivers/input/input-polldev.c | 6 +- drivers/input/joystick/xpad.c | 211 ++++++- drivers/input/keyboard/locomokbd.c | 73 ++- drivers/input/keyboard/tosakbd.c | 21 +- drivers/input/touchscreen/Kconfig | 53 ++ drivers/input/touchscreen/Makefile | 7 + drivers/input/touchscreen/ads7846.c | 22 +- drivers/input/touchscreen/mainstone-wm97xx.c | 302 ++++++++++ drivers/input/touchscreen/usbtouchscreen.c | 31 +- drivers/input/touchscreen/wm9705.c | 353 ++++++++++++ drivers/input/touchscreen/wm9712.c | 462 +++++++++++++++ drivers/input/touchscreen/wm9713.c | 460 +++++++++++++++ drivers/input/touchscreen/wm97xx-core.c | 789 ++++++++++++++++++++++++++ include/linux/input.h | 8 +- include/linux/spi/ads7846.h | 3 +- include/linux/wm97xx.h | 311 ++++++++++ 17 files changed, 3036 insertions(+), 86 deletions(-) create mode 100644 drivers/input/touchscreen/mainstone-wm97xx.c create mode 100644 drivers/input/touchscreen/wm9705.c create mode 100644 drivers/input/touchscreen/wm9712.c create mode 100644 drivers/input/touchscreen/wm9713.c create mode 100644 drivers/input/touchscreen/wm97xx-core.c create mode 100644 include/linux/wm97xx.h ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## ## # merge kvm resolve /home/jejb/kvm-fixup.diff ## Auto-merged MAINTAINERS Removed arch/x86/kvm/segment_descriptor.h Auto-merged include/asm-s390/kvm.h CONFLICT (add/add): Merge conflict in include/asm-s390/kvm.h Created commit 8ca9417: Resolve Patch: /home/jejb/kvm-fixup.diff ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/scsi/ipr.c Auto-merged include/linux/libata.h Merge made by recursive. drivers/ata/Kconfig | 2 +- drivers/ata/ahci.c | 177 +--- drivers/ata/ata_generic.c | 49 +- drivers/ata/ata_piix.c | 285 ++---- drivers/ata/libata-core.c | 2057 +++--------------------------------- drivers/ata/libata-eh.c | 157 ++-- drivers/ata/libata-pmp.c | 104 +-- drivers/ata/libata-scsi.c | 7 +- drivers/ata/libata-sff.c | 2229 +++++++++++++++++++++++++++++++++++---- drivers/ata/libata.h | 11 +- drivers/ata/pata_acpi.c | 71 +-- drivers/ata/pata_ali.c | 161 +--- drivers/ata/pata_amd.c | 260 +---- drivers/ata/pata_artop.c | 121 +-- drivers/ata/pata_at32.c | 44 +- drivers/ata/pata_atiixp.c | 55 +- drivers/ata/pata_bf54x.c | 35 +- drivers/ata/pata_cmd640.c | 73 +- drivers/ata/pata_cmd64x.c | 135 +-- drivers/ata/pata_cs5520.c | 58 +- drivers/ata/pata_cs5530.c | 70 +- drivers/ata/pata_cs5535.c | 50 +- drivers/ata/pata_cs5536.c | 50 +- drivers/ata/pata_cypress.c | 50 +- drivers/ata/pata_efar.c | 64 +- drivers/ata/pata_hpt366.c | 75 +- drivers/ata/pata_hpt37x.c | 237 +---- drivers/ata/pata_hpt3x2n.c | 77 +-- drivers/ata/pata_hpt3x3.c | 50 +- drivers/ata/pata_icside.c | 59 +- drivers/ata/pata_isapnp.c | 37 +- drivers/ata/pata_it8213.c | 65 +- drivers/ata/pata_it821x.c | 91 +-- drivers/ata/pata_ixp4xx_cf.c | 40 +- drivers/ata/pata_jmicron.c | 66 +-- drivers/ata/pata_legacy.c | 276 +----- drivers/ata/pata_marvell.c | 67 +-- drivers/ata/pata_mpc52xx.c | 42 +- drivers/ata/pata_mpiix.c | 55 +- drivers/ata/pata_netcell.c | 56 +- drivers/ata/pata_ninja32.c | 46 +- drivers/ata/pata_ns87410.c | 60 +- drivers/ata/pata_ns87415.c | 94 +-- drivers/ata/pata_oldpiix.c | 66 +- drivers/ata/pata_opti.c | 64 +- drivers/ata/pata_optidma.c | 101 +-- drivers/ata/pata_pcmcia.c | 64 +- drivers/ata/pata_pdc2027x.c | 89 +-- drivers/ata/pata_pdc202xx_old.c | 96 +-- drivers/ata/pata_platform.c | 44 +- drivers/ata/pata_qdi.c | 63 +- drivers/ata/pata_radisys.c | 51 +- drivers/ata/pata_rb500_cf.c | 44 +- drivers/ata/pata_rz1000.c | 49 +- drivers/ata/pata_sc1200.c | 53 +- drivers/ata/pata_scc.c | 54 +- drivers/ata/pata_serverworks.c | 104 +-- drivers/ata/pata_sil680.c | 63 +- drivers/ata/pata_sis.c | 228 +---- drivers/ata/pata_sl82c105.c | 65 +- drivers/ata/pata_triflex.c | 56 +- drivers/ata/pata_via.c | 130 +-- drivers/ata/pata_winbond.c | 41 +- drivers/ata/pdc_adma.c | 68 +-- drivers/ata/sata_fsl.c | 39 +- drivers/ata/sata_inic162x.c | 55 +- drivers/ata/sata_mv.c | 371 +++----- drivers/ata/sata_nv.c | 219 +--- drivers/ata/sata_promise.c | 100 +-- drivers/ata/sata_qstor.c | 46 +- drivers/ata/sata_sil.c | 47 +- drivers/ata/sata_sil24.c | 116 +-- drivers/ata/sata_sis.c | 38 +- drivers/ata/sata_svw.c | 33 +- drivers/ata/sata_sx4.c | 19 +- drivers/ata/sata_uli.c | 43 +- drivers/ata/sata_via.c | 114 +-- drivers/ata/sata_vsc.c | 36 +- drivers/scsi/ipr.c | 3 +- include/linux/libata.h | 596 ++++++----- 80 files changed, 3702 insertions(+), 7634 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## ## # revert 1ad2fb5191fc78f8835130eddc6150eddb9bdcba infiniband ## Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c Auto-merged drivers/infiniband/hw/amso1100/c2_qp.c Auto-merged drivers/infiniband/hw/amso1100/c2_rnic.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_qp.c Auto-merged drivers/infiniband/hw/nes/nes_cm.c Auto-merged drivers/infiniband/hw/nes/nes_hw.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c Created commit cc19df4: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__" 26 files changed, 302 insertions(+), 302 deletions(-) ## # merge infiniband resolve /home/jejb/infiniband-fixup.diff ## Auto-merged drivers/infiniband/core/uverbs.h Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c Auto-merged drivers/infiniband/hw/mlx4/main.c Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Auto-merged include/rdma/ib_verbs.h Created commit 2570003: Resolve Patch: /home/jejb/infiniband-fixup.diff ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git fo