Switched to branch "2.6.25-rc6-mc15" Switched to branch "ide" Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc6-mc15" 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. Finished one revert. Switched to branch "2.6.25-rc6-mc15" Switched to branch "gregkh-pci" .dotest/patch:167: space before tab in indent. dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name); warning: 1 line adds whitespace errors. Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:32: space before tab in indent. for (j = 0; j < N_IN_URB; j++) { .dotest/patch:33: space before tab in indent. portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL); .dotest/patch:34: space before tab in indent. if (!portdata->in_buffer[j]) { .dotest/patch:35: space before tab in indent. for ( --j; j >= 0; j--) .dotest/patch:36: space before tab in indent. kfree(portdata->in_buffer[j]); warning: squelched 4 whitespace errors warning: 9 lines add whitespace errors. .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-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Switched to branch "i2c" Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" 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/dtor/input 688dad4..481419e for-linus -> input remote: Counting objects: 1  remote: Counting objects: 31  remote: Counting objects: 111  remote: Counting objects: 6600, done. remote: Compressing objects: 0% (1/1631)  remote: Compressing objects: 1% (17/1631)  remote: Compressing objects: 2% (33/1631)  remote: Compressing objects: 3% (49/1631)  remote: Compressing objects: 4% (66/1631)  remote: Compressing objects: 5% (82/1631)  remote: Compressing objects: 6% (98/1631)  remote: Compressing objects: 7% (115/1631)  remote: Compressing objects: 7% (118/1631)  remote: Compressing objects: 8% (131/1631)  remote: Compressing objects: 9% (147/1631)  remote: Compressing objects: 10% (164/1631)  remote: Compressing objects: 11% (180/1631)  remote: Compressing objects: 12% (196/1631)  remote: Compressing objects: 12% (203/1631)  remote: Compressing objects: 13% (213/1631)  remote: Compressing objects: 14% (229/1631)  remote: Compressing objects: 14% (241/1631)  remote: Compressing objects: 15% (245/1631)  remote: Compressing objects: 16% (261/1631)  remote: Compressing objects: 17% (278/1631)  remote: Compressing objects: 18% (294/1631)  remote: Compressing objects: 19% (310/1631)  remote: Compressing objects: 20% (327/1631)  remote: Compressing objects: 21% (343/1631)  remote: Compressing objects: 22% (359/1631)  remote: Compressing objects: 23% (376/1631)  remote: Compressing objects: 24% (392/1631)  remote: Compressing objects: 25% (408/1631)  remote: Compressing objects: 26% (425/1631)  remote: Compressing objects: 27% (441/1631)  remote: Compressing objects: 28% (457/1631)  remote: Compressing objects: 29% (473/1631)  remote: Compressing objects: 30% (490/1631)  remote: Compressing objects: 31% (506/1631)  remote: Compressing objects: 32% (522/1631)  remote: Compressing objects: 33% (539/1631)  remote: Compressing objects: 34% (555/1631)  remote: Compressing objects: 35% (571/1631)  remote: Compressing objects: 36% (588/1631)  remote: Compressing objects: 37% (604/1631)  remote: Compressing objects: 38% (620/1631)  remote: Compressing objects: 39% (637/1631)  remote: Compressing objects: 40% (653/1631)  remote: Compressing objects: 41% (669/1631)  remote: Compressing objects: 42% (686/1631)  remote: Compressing objects: 43% (702/1631)  remote: Compressing objects: 44% (718/1631)  remote: Compressing objects: 45% (734/1631)  remote: Compressing objects: 46% (751/1631)  remote: Compressing objects: 47% (767/1631)  remote: Compressing objects: 48% (783/1631)  remote: Compressing objects: 48% (795/1631)  remote: Compressing objects: 49% (800/1631)  remote: Compressing objects: 50% (816/1631)  remote: Compressing objects: 51% (832/1631)  remote: Compressing objects: 52% (849/1631)  remote: Compressing objects: 53% (865/1631)  remote: Compressing objects: 54% (881/1631)  remote: Compressing objects: 55% (898/1631)  remote: Compressing objects: 56% (914/1631)  remote: Compressing objects: 57% (930/1631)  remote: Compressing objects: 58% (946/1631)  remote: Compressing objects: 59% (963/1631)  remote: Compressing objects: 60% (979/1631)  remote: Compressing objects: 61% (995/1631)  remote: Compressing objects: 62% (1012/1631)  remote: Compressing objects: 63% (1028/1631)  remote: Compressing objects: 64% (1044/1631)  remote: Compressing objects: 65% (1061/1631)  remote: Compressing objects: 66% (1077/1631)  remote: Compressing objects: 67% (1093/1631)  remote: Compressing objects: 68% (1110/1631)  remote: Compressing objects: 69% (1126/1631)  remote: Compressing objects: 70% (1142/1631)  remote: Compressing objects: 71% (1159/1631)  remote: Compressing objects: 72% (1175/1631)  remote: Compressing objects: 73% (1191/1631)  remote: Compressing objects: 74% (1207/1631)  remote: Compressing objects: 75% (1224/1631)  remote: Compressing objects: 76% (1240/1631)  remote: Compressing objects: 77% (1256/1631)  remote: Compressing objects: 78% (1273/1631)  remote: Compressing objects: 79% (1289/1631)  remote: Compressing objects: 80% (1305/1631)  remote: Compressing objects: 81% (1322/1631)  remote: Compressing objects: 82% (1338/1631)  remote: Compressing objects: 83% (1354/1631)  remote: Compressing objects: 84% (1371/1631)  remote: Compressing objects: 85% (1387/1631)  remote: Compressing objects: 86% (1403/1631)  remote: Compressing objects: 87% (1419/1631)  remote: Compressing objects: 88% (1436/1631)  remote: Compressing objects: 89% (1452/1631)  remote: Compressing objects: 90% (1468/1631)  remote: Compressing objects: 91% (1485/1631)  remote: Compressing objects: 92% (1501/1631)  remote: Compressing objects: 93% (1517/1631)  remote: Compressing objects: 94% (1534/1631)  remote: Compressing objects: 95% (1550/1631)  remote: Compressing objects: 96% (1566/1631)  remote: Compressing objects: 97% (1583/1631)  remote: Compressing objects: 98% (1599/1631)  remote: Compressing objects: 99% (1615/1631)  remote: Compressing objects: 100% (1631/1631)  remote: Compressing objects: 100% (1631/1631), done. Receiving objects: 0% (1/6415) Receiving objects: 1% (65/6415) Receiving objects: 2% (129/6415) Receiving objects: 3% (193/6415), 59.99 KiB | 111 KiB/s Receiving objects: 4% (257/6415), 59.99 KiB | 111 KiB/s Receiving objects: 5% (321/6415), 59.99 KiB | 111 KiB/s Receiving objects: 6% (385/6415), 59.99 KiB | 111 KiB/s Receiving objects: 7% (450/6415), 59.99 KiB | 111 KiB/s Receiving objects: 8% (514/6415), 59.99 KiB | 111 KiB/s Receiving objects: 9% (578/6415), 59.99 KiB | 111 KiB/s Receiving objects: 10% (642/6415), 59.99 KiB | 111 KiB/s Receiving objects: 11% (706/6415), 59.99 KiB | 111 KiB/s Receiving objects: 12% (770/6415), 59.99 KiB | 111 KiB/s Receiving objects: 13% (834/6415), 59.99 KiB | 111 KiB/s Receiving objects: 14% (899/6415), 59.99 KiB | 111 KiB/s Receiving objects: 15% (963/6415), 59.99 KiB | 111 KiB/s Receiving objects: 16% (1027/6415), 59.99 KiB | 111 KiB/s Receiving objects: 16% (1088/6415), 283.99 KiB | 268 KiB/s Receiving objects: 17% (1091/6415), 283.99 KiB | 268 KiB/s Receiving objects: 18% (1155/6415), 283.99 KiB | 268 KiB/s Receiving objects: 19% (1219/6415), 283.99 KiB | 268 KiB/s Receiving objects: 20% (1283/6415), 283.99 KiB | 268 KiB/s Receiving objects: 21% (1348/6415), 283.99 KiB | 268 KiB/s Receiving objects: 22% (1412/6415), 283.99 KiB | 268 KiB/s Receiving objects: 23% (1476/6415), 283.99 KiB | 268 KiB/s Receiving objects: 24% (1540/6415), 283.99 KiB | 268 KiB/s Receiving objects: 25% (1604/6415), 283.99 KiB | 268 KiB/s Receiving objects: 26% (1668/6415), 283.99 KiB | 268 KiB/s Receiving objects: 27% (1733/6415), 283.99 KiB | 268 KiB/s Receiving objects: 28% (1797/6415), 283.99 KiB | 268 KiB/s Receiving objects: 29% (1861/6415), 283.99 KiB | 268 KiB/s Receiving objects: 29% (1910/6415), 483.99 KiB | 82 KiB/s Receiving objects: 30% (1925/6415), 483.99 KiB | 82 KiB/s Receiving objects: 31% (1989/6415), 483.99 KiB | 82 KiB/s Receiving objects: 32% (2053/6415), 483.99 KiB | 82 KiB/s Receiving objects: 33% (2117/6415), 483.99 KiB | 82 KiB/s Receiving objects: 34% (2182/6415), 483.99 KiB | 82 KiB/s Receiving objects: 35% (2246/6415), 483.99 KiB | 82 KiB/s Receiving objects: 36% (2310/6415), 483.99 KiB | 82 KiB/s Receiving objects: 37% (2374/6415), 483.99 KiB | 82 KiB/s Receiving objects: 38% (2438/6415), 483.99 KiB | 82 KiB/s Receiving objects: 39% (2502/6415), 483.99 KiB | 82 KiB/s Receiving objects: 40% (2566/6415), 483.99 KiB | 82 KiB/s Receiving objects: 41% (2631/6415), 483.99 KiB | 82 KiB/s Receiving objects: 42% (2695/6415), 483.99 KiB | 82 KiB/s Receiving objects: 43% (2759/6415), 483.99 KiB | 82 KiB/s Receiving objects: 44% (2823/6415), 483.99 KiB | 82 KiB/s Receiving objects: 45% (2887/6415), 483.99 KiB | 82 KiB/s Receiving objects: 46% (2951/6415), 483.99 KiB | 82 KiB/s Receiving objects: 47% (3016/6415), 483.99 KiB | 82 KiB/s Receiving objects: 48% (3080/6415), 483.99 KiB | 82 KiB/s Receiving objects: 49% (3144/6415), 483.99 KiB | 82 KiB/s Receiving objects: 50% (3208/6415), 483.99 KiB | 82 KiB/s Receiving objects: 51% (3272/6415), 483.99 KiB | 82 KiB/s Receiving objects: 52% (3336/6415), 483.99 KiB | 82 KiB/s Receiving objects: 53% (3400/6415), 483.99 KiB | 82 KiB/s Receiving objects: 54% (3465/6415), 483.99 KiB | 82 KiB/s Receiving objects: 55% (3529/6415), 483.99 KiB | 82 KiB/s Receiving objects: 56% (3593/6415), 483.99 KiB | 82 KiB/s Receiving objects: 57% (3657/6415), 483.99 KiB | 82 KiB/s Receiving objects: 58% (3721/6415), 483.99 KiB | 82 KiB/s Receiving objects: 59% (3785/6415), 483.99 KiB | 82 KiB/s Receiving objects: 60% (3849/6415), 483.99 KiB | 82 KiB/s Receiving objects: 61% (3914/6415), 483.99 KiB | 82 KiB/s Receiving objects: 62% (3978/6415), 483.99 KiB | 82 KiB/s Receiving objects: 63% (4042/6415), 483.99 KiB | 82 KiB/s Receiving objects: 64% (4106/6415), 483.99 KiB | 82 KiB/s Receiving objects: 65% (4170/6415), 483.99 KiB | 82 KiB/s Receiving objects: 66% (4234/6415), 483.99 KiB | 82 KiB/s Receiving objects: 67% (4299/6415), 483.99 KiB | 82 KiB/s Receiving objects: 68% (4363/6415), 483.99 KiB | 82 KiB/s Receiving objects: 69% (4427/6415), 483.99 KiB | 82 KiB/s Receiving objects: 70% (4491/6415), 483.99 KiB | 82 KiB/s Receiving objects: 71% (4555/6415), 483.99 KiB | 82 KiB/s Receiving objects: 72% (4619/6415), 483.99 KiB | 82 KiB/s Receiving objects: 73% (4683/6415), 483.99 KiB | 82 KiB/s Receiving objects: 74% (4748/6415), 483.99 KiB | 82 KiB/s Receiving objects: 75% (4812/6415), 483.99 KiB | 82 KiB/s Receiving objects: 76% (4876/6415), 483.99 KiB | 82 KiB/s Receiving objects: 77% (4940/6415), 483.99 KiB | 82 KiB/s Receiving objects: 78% (5004/6415), 483.99 KiB | 82 KiB/s Receiving objects: 79% (5068/6415), 483.99 KiB | 82 KiB/s Receiving objects: 80% (5132/6415), 483.99 KiB | 82 KiB/s Receiving objects: 81% (5197/6415), 483.99 KiB | 82 KiB/s Receiving objects: 82% (5261/6415), 483.99 KiB | 82 KiB/s Receiving objects: 83% (5325/6415), 483.99 KiB | 82 KiB/s Receiving objects: 84% (5389/6415), 483.99 KiB | 82 KiB/s Receiving objects: 84% (5433/6415), 483.99 KiB | 82 KiB/s Receiving objects: 85% (5453/6415), 483.99 KiB | 82 KiB/s Receiving objects: 86% (5517/6415), 483.99 KiB | 82 KiB/s Receiving objects: 87% (5582/6415), 483.99 KiB | 82 KiB/s Receiving objects: 88% (5646/6415), 483.99 KiB | 82 KiB/s Receiving objects: 89% (5710/6415), 483.99 KiB | 82 KiB/s Receiving objects: 90% (5774/6415), 483.99 KiB | 82 KiB/s Receiving objects: 91% (5838/6415), 483.99 KiB | 82 KiB/s Receiving objects: 92% (5902/6415), 483.99 KiB | 82 KiB/s Receiving objects: 93% (5966/6415), 483.99 KiB | 82 KiB/s Receiving objects: 94% (6031/6415), 483.99 KiB | 82 KiB/s Receiving objects: 95% (6095/6415), 483.99 KiB | 82 KiB/s Receiving objects: 96% (6159/6415), 483.99 KiB | 82 KiB/s Receiving objects: 97% (6223/6415), 483.99 KiB | 82 KiB/s Receiving objects: 98% (6287/6415), 483.99 KiB | 82 KiB/s Receiving objects: 99% (6351/6415), 483.99 KiB | 82 KiB/s Receiving objects: 100% (6415/6415), 483.99 KiB | 82 KiB/s Receiving objects: 100% (6415/6415), 1.16 MiB | 82 KiB/s, done. Resolving deltas: 0% (1/5413) Resolving deltas: 1% (55/5413) Resolving deltas: 2% (109/5413) Resolving deltas: 3% (163/5413) Resolving deltas: 4% (217/5413) remote: Total 6415 (delta 5413), reused 5292 (delta 4766) Resolving deltas: 5% (292/5413) Resolving deltas: 10% (585/5413) Resolving deltas: 11% (604/5413) Resolving deltas: 12% (662/5413) Resolving deltas: 13% (753/5413) Resolving deltas: 14% (778/5413) Resolving deltas: 16% (903/5413) Resolving deltas: 22% (1244/5413) Resolving deltas: 24% (1302/5413) Resolving deltas: 25% (1361/5413) Resolving deltas: 32% (1747/5413) Resolving deltas: 33% (1805/5413) Resolving deltas: 34% (1844/5413) Resolving deltas: 37% (2038/5413) Resolving deltas: 38% (2061/5413) Resolving deltas: 40% (2205/5413) Resolving deltas: 41% (2224/5413) Resolving deltas: 42% (2327/5413) Resolving deltas: 43% (2338/5413) Resolving deltas: 44% (2384/5413) Resolving deltas: 47% (2566/5413) Resolving deltas: 49% (2701/5413) Resolving deltas: 50% (2715/5413) Resolving deltas: 53% (2896/5413) Resolving deltas: 54% (2926/5413) Resolving deltas: 55% (3016/5413) Resolving deltas: 57% (3095/5413) Resolving deltas: 58% (3178/5413) Resolving deltas: 59% (3212/5413) Resolving deltas: 60% (3251/5413) Resolving deltas: 61% (3309/5413) Resolving deltas: 63% (3415/5413) Resolving deltas: 64% (3492/5413) Resolving deltas: 65% (3544/5413) Resolving deltas: 66% (3596/5413) Resolving deltas: 67% (3648/5413) Resolving deltas: 68% (3682/5413) Resolving deltas: 69% (3744/5413) Resolving deltas: 70% (3795/5413) Resolving deltas: 71% (3864/5413) Resolving deltas: 72% (3899/5413) Resolving deltas: 73% (3956/5413) Resolving deltas: 74% (4030/5413) Resolving deltas: 75% (4072/5413) Resolving deltas: 76% (4162/5413) Resolving deltas: 77% (4174/5413) Resolving deltas: 78% (4252/5413) Resolving deltas: 79% (4301/5413) Resolving deltas: 80% (4336/5413) Resolving deltas: 81% (4415/5413) Resolving deltas: 82% (4474/5413) Resolving deltas: 83% (4496/5413) Resolving deltas: 84% (4548/5413) Resolving deltas: 85% (4623/5413) Resolving deltas: 87% (4714/5413) Resolving deltas: 88% (4766/5413) Resolving deltas: 89% (4850/5413) Resolving deltas: 90% (4882/5413) Resolving deltas: 93% (5058/5413) Resolving deltas: 94% (5099/5413) Resolving deltas: 96% (5246/5413) Resolving deltas: 97% (5302/5413) Resolving deltas: 98% (5310/5413) Resolving deltas: 98% (5328/5413) Resolving deltas: 99% (5359/5413) Resolving deltas: 100% (5413/5413) Resolving deltas: 100% (5413/5413), completed with 65 local objects. From /pub/scm/linux/kernel/git/avi/kvm 361be34..de9babf master -> kvm error: branch 'libata-upstream' not found. From /pub/scm/linux/kernel/git/roland/infiniband + 2978ba2...85b7b7b for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 93, done. remote: Compressing objects: 3% (1/26)  remote: Compressing objects: 7% (2/26)  remote: Compressing objects: 11% (3remote: /26)  remote: Compressing objects: 15% (4/26)  remote: Compressing objects: 19% (5/26)  remote: Compressing objects: 23% (6/26)  remote: Compressing objects: 26% (7/26)  remote: Compressing objects:remote: 30% (8/26)  remote: Compressing objects: 34% (9/26)  remote: Compressing objects: 38% (10/26)  remote: Compressing objects: 42% (11/26)  remote: Coremote: mpressing objects: 46% (12/26)  remote: Compressing objects: 50% (13/26)  remote: Compressing objects: 53% (14/26)  remote: Compressing objectsremote: : 57% (15/26)  remote: Compressing objects: 61% (16/26)  remote: Compressing objects: 65% (17/26)  remote: Compressing objects: 69% (18/26)  remote: remote: Compressing objects: 73% (19/26)  remote: Compressing objects: 76% (20/26)  remote: Compressing objects: 80% (21/26)  remote: Compressing objeremote: cts: 84% (22/26)  remote: Compressing objects: 88% (23/26)  remote: Compressing objects: 92% (24/26)  remote: Compressing objects: 96% (25/26)remote:  remote: Compressing objects: 100% (26/26)  remote: Compressing objects: 100% (26/26), done. remote: Total 73 (delta 62), reused 58 (delta 47) From /pub/scm/linux/kernel/git/drzeus/mmc 882c491..4a8d2de for-andrew -> mmc-devel Already on branch "2.6.25-rc6-mc15" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + b9a2c1b...9574dcc master -> x86 (forced update) Switched to branch "x86" Finished one revert. Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "doc" Switched to branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" Already on branch "2.6.25-rc6-mc15" ma-initialization-completely-on-revs-lt-0x20.patch ide-move-ide_setup_dma-call-out-from-init_dma-method.patch ide-export-ide_allocate_dma_engine.patch ide-factor-out-setting-pci-bus-mastering-from-ide_hwif_setup_dma.patch ide-cleanup-ide_setup_dma.patch au1xxx-ide-fix-mwdma-support.patch ide-do-complete-dma-setup-in-init_dma-method-take-2.patch ide-pmac-use-init_dma-method.patch icside-use-init_dma-method.patch sgiioc4-use-init_dma-method.patch palm_bk3710-use-init_dma-method.patch au1xxx-ide-use-init_dma-method.patch sl82c105-check-bridge-revision-in-sl82c105_init_one.patch ide-add-ide_hflag_serialize_dma-host-flag.patch ide-add-struct-ide_dma_ops-take-2.patch ide-constify-struct-ide_dma_ops.patch ide-tape-remove-tape-cache_stage.patch ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_write_request.patch ide-tape-remove-pipeline-speed_control-calculations.patch ide-tape-remove-pipeline-specific-code-from-idetape_add_chrdev_read_request.patch ide-add-ignore_cable-kernel-parameter.patch ide-remove-obsoleted-idex-serialize-kernel-parameter.patch ide-remove-obsoleted-idex-reset-kernel-parameter.patch ide-remove-obsoleted-idex-kernel-parameters.patch ide-remove-obsoleted-hdx-noautotune-kernel-parameter.patch ide-tape-remove-unused-parameter-from-idetape_copy_stage_to_user.patch ide-tape-remove-unused-parameter-from-idetape_copy_stage_from_user.patch ide-tape-remove-pipeline-specific-code-in-idetape_space_over_filemarks.patch ide-tape-remove-idetape_pipeline_size.patch ide-tape-remove-idetape_remove_stage_head.patch ide-tape-remove-pipeline-specific-code-from-idetape_end_request.patch ide-tape-unwrap-idetape_queue_pc_tail.patch ide-tape-remove-remaining-pipeline-functionality.patch ide-tape-remove-pipelined-mode-tape-control-flags.patch ide-tape-remove-pipeline-specific-members-from-struct-ide_tape_obj.patch ide-tape-remove-pipelined-mode-parameters.patch ide-tape-remove-misc-references-to-pipelined-operation-in-the-comments.patch ide-tape-remove-pipelined-mode-description-from-documentation_ide_ide-tape-txt.patch ide-tape-remove-comments-markup-from-documentation_ide_ide-tape-txt.patch ## # merge ide resolve /home/jejb/ide-fixups.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged drivers/ide/ide-lib.c Auto-merged drivers/ide/ide-tape.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Removed include/linux/hdsmart.h Created commit dc151c7: Resolve Patch: /home/jejb/ide-fixups.diff ## # 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-debug-for-bad-dev_attr_show-return-value.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 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 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-add-pgprot_noncached-to-uio-mmap-code.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 503546 bytes received 884 bytes 1008860.00 bytes/sec total size is 498578 speedup is 0.99 2.6.25-rc6-git6 to 028011e1391eab27e7bc113c2ac08d4f55584a75 Using base 028011e1391eab27e7bc113c2ac08d4f55584a75 uio-add-pgprot_noncached-to-uio-mmap-code.patch 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 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-convert-debug-functions-declared-inline-__attribute__-to-statement-expression-macros.patch driver-core-cpu-fix-section-mismatch-in-cpu.c-store_online.patch sysdev-detect-multiple-driver-registrations.patch driver-core-debug-for-bad-dev_attr_show-return-value.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 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 sysfs-crash-debugging.patch ## # quiltstable gregkh-driver scsi-driverbase scsi-driverbase-base ## Created commit e8f74ed: Revert "sysfs: crash debugging" 6 files changed, 1 insertions(+), 22 deletions(-) Created commit ce0c633: Revert "warn when statically-allocated kobjects are used" 3 files changed, 0 insertions(+), 62 deletions(-) Created commit 22115df: Revert "Make put_device() warn that it will sleep" 1 files changed, 0 insertions(+), 1 deletions(-) Created commit 13fd42f: Revert "driver core: remove no longer used "struct class_device"" 3 files changed, 745 insertions(+), 1 deletions(-) Created commit a8433f5: Revert "SCSI: convert struct class_device to struct device" 55 files changed, 1505 insertions(+), 1755 deletions(-) Created commit 0be0f93: Revert "DRM: remove unused dev_class" 1 files changed, 1 insertions(+), 0 deletions(-) Created commit df8ba3d: Revert "IB: rename "dev" to "srp_dev" in srp_host structure" 2 files changed, 24 insertions(+), 27 deletions(-) Created commit 79e21f6: Revert "IB: convert struct class_device to struct device" 15 files changed, 319 insertions(+), 352 deletions(-) Created commit 13fbd3c: Revert "memstick: convert struct class_device to struct device" 4 files changed, 28 insertions(+), 27 deletions(-) Created commit 31faa56: Revert "driver core: replace remaining __FUNCTION__ occurrences" 7 files changed, 36 insertions(+), 36 deletions(-) Created commit c646698: Revert "NET: convert the phy_device file to use bus_find_device_by_name" 1 files changed, 7 insertions(+), 1 deletions(-) Created commit f2fee85: Revert "SYSFS: Explicitly include required header file slab.h." 2 files changed, 0 insertions(+), 2 deletions(-) Created commit c325843: 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 c3b54d4: 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 9807100: Revert "PM: Make wakeup flags available whenever CONFIG_PM is set" 3 files changed, 17 insertions(+), 23 deletions(-) Created commit 391cabd: Revert "PM: Fix misuse of wakeup flag accessors in serial core" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit b20b4b5: Revert "Driver core: Call device_pm_add() after bus_add_device() in device_add()" 2 files changed, 11 insertions(+), 8 deletions(-) Created commit e458f06: Revert "PM: Handle device registrations during suspend/resume" 5 files changed, 52 insertions(+), 40 deletions(-) Created commit 56d64a8: Revert "block: send disk "change" event for rescan_partitions()" 1 files changed, 0 insertions(+), 4 deletions(-) Created commit 3fa0fd7: Revert "driver core: debug for bad dev_attr_show() return value." 2 files changed, 1 insertions(+), 12 deletions(-) Created commit 417c828: Revert "sysdev: detect multiple driver registrations" 1 files changed, 0 insertions(+), 16 deletions(-) Created commit b05a2c7: Revert "driver core: cpu: fix section mismatch in cpu.c:store_online" 1 files changed, 2 insertions(+), 2 deletions(-) Created commit ebae29b: 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 f86edfb: Revert "power_state: remove it from driver core" 1 files changed, 5 insertions(+), 0 deletions(-) Created commit 82ad7fa: Revert "PNP: add all PNP card device id's as individual aliases" 1 files changed, 13 insertions(+), 44 deletions(-) Created commit 17c7e8b: Revert "firmware: clean up samples for coding style issues" 2 files changed, 38 insertions(+), 40 deletions(-) Created commit 498ce7e: 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 26da633: Revert "sysfs: small header file cleanup for SYSFS=n" 1 files changed, 7 insertions(+), 2 deletions(-) Created commit 663ae63: Revert "driver core: register_memory/unregister_memory clean ups and bugfix" 1 files changed, 15 insertions(+), 7 deletions(-) Created commit a700769: Revert "driver core: memory: semaphore to mutex" 3 files changed, 7 insertions(+), 7 deletions(-) Removed drivers/uio/uio_smx.c Created commit 23ec2a8: 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 b3da6d6: Revert "UIO: Remove needless PCI_DEVICE_ID definition from uio_cif.c" 1 files changed, 4 insertions(+), 0 deletions(-) Created commit 698c9ff: Revert "UIO: arch/arm/Kconfig: Make UIO available on ARM architecture" 1 files changed, 0 insertions(+), 2 deletions(-) Created commit 09c7964: Revert "uio: mark pci_device_id hilscher_pci_ids[] __devinitdata" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit f2a0911: Revert "uio: Kconfig improvements" 1 files changed, 5 insertions(+), 5 deletions(-) Created commit abcf1a5: Revert "kobject: catch kobjects that are not initialized" 1 files changed, 1 insertions(+), 8 deletions(-) Created commit 5fec45b: Revert "UIO: add pgprot_noncached() to UIO mmap code" 1 files changed, 0 insertions(+), 2 deletions(-) Merge made by recursive. Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + 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 | 35 +- 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.c | 2 + 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 | 22 +- fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 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 | 14 +- 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 | 61 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 117 files changed, 2749 insertions(+), 2890 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 MAINTAINERS 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/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/transport_class.h Auto-merged include/scsi/scsi_host.h Merge made by recursive. Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + 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 | 35 +- 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.c | 2 + 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 | 22 +- fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 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 | 14 +- 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 | 61 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 117 files changed, 2749 insertions(+), 2890 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-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.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-lockdep-false-alarm-fix.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-revert-pcie-utilize-pcie-transaction-pending-bit.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.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 series sent 444009 bytes received 1016 bytes 890050.00 bytes/sec total size is 438756 speedup is 0.99 Using base gregkh-driver pci-iova-lockdep-false-alarm-fix.patch pci-revert-pcie-utilize-pcie-transaction-pending-bit.patch 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-replace-remaining-__function__-occurrences.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 Auto-merged include/linux/ide.h Created commit b126f29: 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 ub-drop-bug-and-update-small-things.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-support-for-motorola-rokr-z6-cellphone-in-mass-storage-mode.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-stop-vt6212-bus-hogging.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-fix-cut-and-paste-error-in-rtl8150.c.patch usb-fix-gadgetfs-class-request-delegation.patch usb-ftdi_sio-note-missing-locking.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-isd200-fix-memory-leak-in-isd200_get_inquiry_data.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-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-new-quirk-flag-to-avoid-set-interface.patch usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-pl2303-another-product-id.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-sierra-add-another-device-id.patch usb-sierra-dma-fixes.patch usb-standardize-inclusion-protection-and-add-where-missing.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.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 916364 bytes received 1720 bytes 1836168.00 bytes/sec total size is 907094 speedup is 0.99 Using base gregkh-pci usb-fix-gadgetfs-class-request-delegation.patch usb-new-quirk-flag-to-avoid-set-interface.patch usb-pl2303-another-product-id.patch usb-isd200-fix-memory-leak-in-isd200_get_inquiry_data.patch usb-add-support-for-motorola-rokr-z6-cellphone-in-mass-storage-mode.patch usb-sierra-dma-fixes.patch usb-sierra-add-another-device-id.patch usb-ehci-stop-vt6212-bus-hogging.patch 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 usb-fix-cut-and-paste-error-in-rtl8150.c.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-add-usb-serial-spcp8x5-driver.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-gotemp.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- drivers/block/ub.c | 76 +- drivers/net/usb/rtl8150.c | 2 +- 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.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 | 15 +- drivers/usb/core/quirks.c | 17 + 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/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 14 +- 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 | 22 +- 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 | 6 +- 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 | 15 +- 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 | 7 +- 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 | 7 +- 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 | 29 +- drivers/usb/misc/Makefile | 1 + 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/gotemp.c | 295 +++++++ 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 | 113 ++-- drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 84 ++- 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/isd200.c | 1 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 12 +- drivers/usb/storage/transport.c | 26 +- drivers/usb/storage/unusual_devs.h | 19 + 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 | 8 + 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 | 5 +- 162 files changed, 5000 insertions(+), 3197 deletions(-) create mode 100644 drivers/usb/misc/gotemp.c 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 ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## Already up-to-date. ## # 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/kernel/traps.c | 4 + 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/byteorder.h | 6 + include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/asm-avr32/processor.h | 2 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 29 files changed, 1278 insertions(+), 765 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 ## Already up-to-date. ## # 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 arch/powerpc/platforms/cell/iommu.c Auto-merged arch/powerpc/platforms/powermac/setup.c Merge made by recursive. arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 -- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 26 +++- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/maple/setup.c | 2 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++++++++++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/lpar.c | 15 ++ arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 ++-- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/kernel/head.S | 17 -- arch/sparc64/Kconfig | 1 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 +++++++++++++++++++++++++------ drivers/net/pasemi_mac.h | 35 ++++- drivers/net/pasemi_mac_ethtool.c | 159 +++++++++++++++ include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/lmb.h | 82 +------- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 +++++++- 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 ++++++++------ 48 files changed, 966 insertions(+), 280 deletions(-) create mode 100644 drivers/net/pasemi_mac_ethtool.c 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 | 8 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 7 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 53 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- 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/cxusb.c | 1 - drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 2 +- 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 | 2 +- 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 | 26 +- drivers/media/dvb/frontends/tda18271-fe.c | 309 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 8 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 11 +- 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/miropcm20-rds.c | 2 +- drivers/media/radio/radio-cadet.c | 10 +- drivers/media/radio/radio-sf16fmr2.c | 102 +- drivers/media/radio/radio-typhoon.c | 2 +- drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 8 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 4 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 43 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 2 + drivers/media/video/bw-qcam.c | 4 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 7 +- 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/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 529 ++++++- drivers/media/video/cx88/cx88-core.c | 8 +- drivers/media/video/cx88/cx88-dvb.c | 163 ++- 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 | 17 +- drivers/media/video/cx88/cx88.h | 8 + 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 | 2 +- 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 | 12 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 9 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 846 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/pms.c | 4 +- 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 | 52 +- 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 | 8 +- drivers/media/video/pxa_camera.c | 985 +++++++++++ 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/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 347 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 346 +++-- 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 | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 4 +- drivers/media/video/sn9c102/sn9c102_core.c | 4 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 9 +- 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 | 824 +++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 33 +- 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 | 6 +- 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 | 7 +- drivers/media/video/videobuf-dma-sg.c | 121 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 4 +- drivers/media/video/w9968cf.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 2 +- 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 | 52 +- 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 | 4 +- include/media/videobuf-dma-sg.h | 14 +- 213 files changed, 9274 insertions(+), 2572 deletions(-) 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-rc6-git7 to d2532dd20a126020de407c1c2476a75b53fce7ac Using base d2532dd20a126020de407c1c2476a75b53fce7ac i2c-bfin-twi-disable-BF54x.patch i2c-omap-i2c-clock-race.patch sound-tlv320aic3x-fix-driverid-abuse.patch i2c-fix-docbook-problem.patch i2c-new-co-maintainer.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-isp1301_omap-convert-to-new-style-1.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 | 58 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++- drivers/i2c/busses/i2c-omap.c | 36 ++- 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/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 6 +- 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 + sound/soc/codecs/tlv320aic3x.c | 2 - 23 files changed, 1536 insertions(+), 433 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 | 4 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 22 +++- drivers/hid/usbhid/hid-core.c | 40 ++++--- drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 5 +- 7 files changed, 256 insertions(+), 157 deletions(-) ## # 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 ## Merge made by recursive. drivers/input/apm-power.c | 7 ++----- drivers/input/keyboard/pxa27x_keypad.c | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Already up-to-date. ## # 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. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Auto-merged arch/x86/kernel/reboot.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 18 ++ arch/x86/kernel/Makefile | 2 + arch/x86/kernel/crash.c | 3 +- arch/x86/kernel/kvm.c | 247 +++++++++++++++ arch/x86/kernel/kvmclock.c | 187 ++++++++++++ arch/x86/kernel/reboot.c | 13 +- arch/x86/kernel/setup_32.c | 6 + arch/x86/kernel/setup_64.c | 7 + arch/x86/kvm/Kconfig | 2 +- arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 600 +++++++++++++++++++++++++++++++++++++ arch/x86/kvm/i8254.h | 62 ++++ arch/x86/kvm/irq.c | 3 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/mmu.c | 579 +++++++++++++++++++++++++++++++----- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 70 +++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 229 +++++++++++---- arch/x86/kvm/vmx.c | 139 +++++++--- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 386 +++++++++++++++++++----- arch/x86/kvm/x86_emulate.c | 256 +++++++++------- include/asm-x86/kvm.h | 21 ++ include/asm-x86/kvm_host.h | 60 ++++- include/asm-x86/kvm_para.h | 55 ++++ include/asm-x86/reboot.h | 2 + include/linux/kvm.h | 10 + include/linux/kvm_host.h | 23 +- include/linux/kvm_para.h | 11 +- virt/kvm/kvm_main.c | 96 +++++-- 32 files changed, 2682 insertions(+), 463 deletions(-) create mode 100644 arch/x86/kernel/kvm.c create mode 100644 arch/x86/kernel/kvmclock.c create mode 100644 arch/x86/kvm/i8254.c create mode 100644 arch/x86/kvm/i8254.h delete mode 100644 arch/x86/kvm/segment_descriptor.h ## # 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 ## BRANCH upstream not in tree /pub/scm/linux/kernel/git/jgarzik/libata-dev.git, SKIPPING ## # 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 a1dcf69bd2f16de76f530c80c11d1356b13f5423 infiniband ## 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/nes/nes.c Auto-merged drivers/infiniband/hw/nes/nes.h 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_nic.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c Created commit f9c5f98: 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/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 a51cf33: 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 for-linus arm-for-linus ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git master arm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/fw-card.c | 40 +----- drivers/firewire/fw-cdev.c | 13 +- drivers/firewire/fw-device.c | 263 ++++++++++++++++++++++++------ drivers/firewire/fw-device.h | 38 +++- drivers/firewire/fw-ohci.c | 132 ++++++++------- drivers/firewire/fw-ohci.h | 1 + drivers/firewire/fw-sbp2.c | 150 ++++++++--------- drivers/firewire/fw-topology.c | 15 ++ drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 11 +- drivers/firewire/fw-transaction.h | 6 - drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/highlevel.c | 6 +- drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 117 ++++++-------- drivers/ieee1394/pcilynx.c | 15 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 23 files changed, 517 insertions(+), 356 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-fixes-for-linus iop-fixes ## Already up-to-date. ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged crypto/async_tx/async_tx.c Auto-merged crypto/async_tx/async_xor.c Auto-merged drivers/dma/dmaengine.c Auto-merged drivers/dma/fsldma.c Auto-merged drivers/dma/iop-adma.c Merge made by recursive. crypto/async_tx/async_tx.c | 197 ++++++++++++++++++++++++++------ drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 8 -- drivers/dma/ioat_dma.c | 12 -- drivers/dma/iop-adma.c | 21 +--- include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 -- include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 11 +-- 9 files changed, 170 insertions(+), 97 deletions(-) ## # git git://www.linux-mips.org/pub/scm/upstream-linus.git upstream mips ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Merge made by recursive. drivers/mmc/core/host.c | 39 ++- drivers/mmc/host/Kconfig | 18 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pci.c | 773 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 544 ++++++++---------------------- drivers/mmc/host/sdhci.h | 90 ++++-- include/linux/pci_ids.h | 1 + 7 files changed, 1011 insertions(+), 455 deletions(-) create mode 100644 drivers/mmc/host/sdhci-pci.c ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- fs/jffs2/fs.c | 14 +++++++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.26.git master net ## ## # merge net resolve /home/jejb/net-fixup.diff ## Auto-merged Documentation/feature-removal-schedule.txt Removed Documentation/networking/bcm43xx.txt Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged drivers/net/Makefile Removed drivers/net/atl1/Makefile Removed drivers/net/atl1/atl1.h Removed drivers/net/atl1/atl1_ethtool.c Removed drivers/net/atl1/atl1_hw.c Removed drivers/net/atl1/atl1_hw.h Removed drivers/net/atl1/atl1_param.c Removed drivers/net/sk98lin/Makefile Removed drivers/net/sk98lin/h/lm80.h Removed drivers/net/sk98lin/h/skaddr.h Removed drivers/net/sk98lin/h/skcsum.h Removed drivers/net/sk98lin/h/skdebug.h Removed drivers/net/sk98lin/h/skdrv1st.h Removed drivers/net/sk98lin/h/skdrv2nd.h Removed drivers/net/sk98lin/h/skerror.h Removed drivers/net/sk98lin/h/skgedrv.h Removed drivers/net/sk98lin/h/skgehw.h Removed drivers/net/sk98lin/h/skgehwt.h Removed drivers/net/sk98lin/h/skgei2c.h Removed drivers/net/sk98lin/h/skgeinit.h Removed drivers/net/sk98lin/h/skgepnm2.h Removed drivers/net/sk98lin/h/skgepnmi.h Removed drivers/net/sk98lin/h/skgesirq.h Removed drivers/net/sk98lin/h/ski2c.h Removed drivers/net/sk98lin/h/skqueue.h Removed drivers/net/sk98lin/h/skrlmt.h Removed drivers/net/sk98lin/h/sktimer.h Removed drivers/net/sk98lin/h/sktypes.h Removed drivers/net/sk98lin/h/skversion.h Removed drivers/net/sk98lin/h/skvpd.h Removed drivers/net/sk98lin/h/xmac_ii.h Removed drivers/net/sk98lin/skaddr.c Removed drivers/net/sk98lin/skdim.c Removed drivers/net/sk98lin/skethtool.c Removed drivers/net/sk98lin/skge.c Removed drivers/net/sk98lin/skgehwt.c Removed drivers/net/sk98lin/skgeinit.c Removed drivers/net/sk98lin/skgemib.c Removed drivers/net/sk98lin/skgepnmi.c Removed drivers/net/sk98lin/skgesirq.c Removed drivers/net/sk98lin/ski2c.c Removed drivers/net/sk98lin/sklm80.c Removed drivers/net/sk98lin/skqueue.c Removed drivers/net/sk98lin/skrlmt.c Removed drivers/net/sk98lin/sktimer.c Removed drivers/net/sk98lin/skvpd.c Removed drivers/net/sk98lin/skxmac2.c Removed drivers/net/tulip/xircom_tulip_cb.c Removed drivers/net/wireless/bcm43xx/Kconfig Removed drivers/net/wireless/bcm43xx/Makefile Removed drivers/net/wireless/bcm43xx/bcm43xx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h Removed drivers/net/wireless/rt2x00/rt2x00ring.h Removed drivers/s390/net/ctcdbug.c Removed drivers/s390/net/ctcdbug.h Removed drivers/s390/net/ctcmain.c Removed drivers/s390/net/ctcmain.h Removed drivers/s390/net/qeth_fs.h Removed drivers/s390/net/qeth_main.c Removed drivers/s390/net/qeth_mpc.c Removed drivers/s390/net/qeth_proc.c Removed drivers/s390/net/qeth_sys.c Removed drivers/s390/net/qeth_tso.h Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h Auto-merged net/core/sock.c Removed net/ieee80211/softmac/Kconfig Removed net/ieee80211/softmac/Makefile Removed net/ieee80211/softmac/ieee80211softmac_assoc.c Removed net/ieee80211/softmac/ieee80211softmac_auth.c Removed net/ieee80211/softmac/ieee80211softmac_event.c Removed net/ieee80211/softmac/ieee80211softmac_io.c Removed net/ieee80211/softmac/ieee80211softmac_module.c Removed net/ieee80211/softmac/ieee80211softmac_priv.h Removed net/ieee80211/softmac/ieee80211softmac_scan.c Removed net/ieee80211/softmac/ieee80211softmac_wx.c Removed net/mac80211/rc80211_simple.c Removed net/mac80211/regdomain.c Created commit 982f956: Resolve Patch: /home/jejb/net-fixup.diff ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Auto-merged fs/nfs/super.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Merge made by recursive. fs/Kconfig | 70 +++++------ fs/lockd/host.c | 20 ++-- fs/lockd/mon.c | 113 +++++++++++++---- fs/lockd/svc.c | 12 ++ fs/nfs/Makefile | 3 +- fs/nfs/client.c | 16 +++ fs/nfs/dir.c | 2 +- fs/nfs/direct.c | 9 +- fs/nfs/file.c | 6 - fs/nfs/inode.c | 45 +++++++- fs/nfs/internal.h | 13 +-- fs/nfs/nfs2xdr.c | 37 +++++-- fs/nfs/nfs3xdr.c | 37 +++++-- fs/nfs/nfs4proc.c | 18 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/nfs4xdr.c | 39 +++++-- fs/nfs/read.c | 18 +-- fs/nfs/super.c | 130 +++++++++++++------- fs/nfs/unlink.c | 2 +- fs/nfs/write.c | 86 +++++++------ include/linux/lockd/lockd.h | 17 ++-- include/linux/lockd/sm_inter.h | 1 + include/linux/nfs_fs_sb.h | 8 ++ include/linux/sunrpc/auth.h | 13 ++- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/Makefile | 2 +- net/sunrpc/auth.c | 63 ++++++---- net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 7 +- net/sunrpc/auth_null.c | 1 + net/sunrpc/auth_unix.c | 57 ++++----- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 37 files changed, 888 insertions(+), 498 deletions(-) create mode 100644 net/sunrpc/auth_generic.c ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Already up-to-date. ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## Auto-merged arch/s390/defconfig Auto-merged fs/Kconfig Auto-merged kernel/sched.c Merge made by recursive. arch/s390/Kconfig | 4 + arch/s390/defconfig | 4 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/compat_signal.c | 10 + arch/s390/kernel/early.c | 14 ++ arch/s390/kernel/head64.S | 12 ++- arch/s390/kernel/setup.c | 32 ++-- arch/s390/kernel/signal.c | 10 + arch/s390/kernel/smp.c | 87 +++++++++- arch/s390/kernel/time.c | 2 +- arch/s390/kernel/topology.c | 316 +++++++++++++++++++++++++++++++++++ arch/s390/mm/Makefile | 2 +- arch/s390/mm/fault.c | 3 + arch/s390/mm/hugetlbpage.c | 134 +++++++++++++++ arch/s390/mm/init.c | 23 --- arch/s390/mm/vmem.c | 55 ++++++- drivers/base/topology.c | 17 +- drivers/char/hw_random/core.c | 4 + drivers/crypto/Kconfig | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_3990_erp.c | 34 ++++ drivers/s390/block/dasd_eckd.c | 7 + drivers/s390/block/dasd_int.h | 6 + drivers/s390/cio/chsc.c | 12 +- drivers/s390/cio/css.c | 5 + drivers/s390/cio/css.h | 1 + drivers/s390/crypto/zcrypt_api.c | 120 +++++++++++++ drivers/s390/crypto/zcrypt_api.h | 8 + drivers/s390/crypto/zcrypt_pcixcc.c | 199 ++++++++++++++++++++++- drivers/s390/sysinfo.c | 116 ++----------- fs/Kconfig | 3 +- include/asm-s390/page.h | 29 +++- include/asm-s390/pgtable.h | 158 +++++++++++++++++ include/asm-s390/setup.h | 4 + include/asm-s390/smp.h | 3 + include/asm-s390/sysinfo.h | 117 +++++++++++++ include/asm-s390/system.h | 12 ++ include/asm-s390/timex.h | 12 +- include/asm-s390/tlbflush.h | 34 +++-- include/asm-s390/topology.h | 25 +++ include/linux/hugetlb.h | 22 +++ mm/hugetlb.c | 37 +++-- 43 files changed, 1494 insertions(+), 204 deletions(-) create mode 100644 arch/s390/kernel/topology.c create mode 100644 arch/s390/mm/hugetlbpage.c create mode 100644 include/asm-s390/sysinfo.h ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # git git://git.infradead.org/battery-2.6 master battery ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git ALL ocfs2 ## Auto-merged Documentation/feature-removal-schedule.txt Auto-merged MAINTAINERS Auto-merged fs/Kconfig Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 11 + MAINTAINERS | 1 + fs/Kconfig | 26 + fs/ocfs2/Makefile | 14 +- fs/ocfs2/alloc.c | 465 +++++++++++++-- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 51 ++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 49 ++ fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- fs/ocfs2/dlm/dlmdebug.h | 86 +++ fs/ocfs2/dlm/dlmdomain.c | 70 ++- fs/ocfs2/dlm/dlmlock.c | 22 +- fs/ocfs2/dlm/dlmmaster.c | 200 ++----- fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- fs/ocfs2/dlmglue.h | 5 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 184 +------ fs/ocfs2/heartbeat.h | 17 +- fs/ocfs2/ioctl.c | 13 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/journal.c | 211 ++++++- fs/ocfs2/journal.h | 4 + fs/ocfs2/localalloc.c | 4 + fs/ocfs2/namei.c | 4 +- fs/ocfs2/ocfs2.h | 77 ++- fs/ocfs2/ocfs2_fs.h | 79 +++- fs/ocfs2/ocfs2_lockid.h | 2 +- fs/ocfs2/slot_map.c | 454 +++++++++++--- fs/ocfs2/slot_map.h | 32 +- fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ fs/ocfs2/stackglue.c | 568 +++++++++++++++++ fs/ocfs2/stackglue.h | 261 ++++++++ fs/ocfs2/suballoc.c | 103 +++- fs/ocfs2/suballoc.h | 1 + fs/ocfs2/super.c | 208 ++++--- fs/sysfs/symlink.c | 9 +- 40 files changed, 5120 insertions(+), 1009 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb create mode 100644 fs/ocfs2/dlm/dlmdebug.h create mode 100644 fs/ocfs2/stack_o2cb.c create mode 100644 fs/ocfs2/stack_user.c create mode 100644 fs/ocfs2/stackglue.c create mode 100644 fs/ocfs2/stackglue.h ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-akpm selinux ## Auto-merged security/commoncap.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/selinux/include/security.h Merge made by recursive. security/commoncap.c | 4 +- security/keys/internal.h | 8 +- security/root_plug.c | 2 +- security/security.c | 8 +- security/selinux/avc.c | 4 +- security/selinux/hooks.c | 64 ++++++++++++++------ security/selinux/include/av_perm_to_string.h | 5 ++ security/selinux/include/av_permissions.h | 5 ++ security/selinux/include/netlabel.h | 16 ----- security/selinux/include/objsec.h | 8 --- security/selinux/include/security.h | 2 + security/selinux/netlabel.c | 82 +++++--------------------- security/selinux/netlink.c | 2 +- security/selinux/selinuxfs.c | 11 ++-- security/selinux/ss/avtab.c | 40 ++++++------ security/selinux/ss/conditional.c | 16 +++--- security/selinux/ss/ebitmap.c | 14 ++-- security/selinux/ss/policydb.c | 54 +++++++++--------- security/selinux/ss/services.c | 35 ++++++----- 19 files changed, 174 insertions(+), 206 deletions(-) ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Merge made by recursive. arch/sh/Kconfig | 19 +- arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 1 + arch/sh/boards/renesas/migor/setup.c | 55 ++- arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- arch/sh/boards/se/7721/Makefile | 1 + arch/sh/boards/se/7721/irq.c | 45 ++ arch/sh/boards/se/7721/setup.c | 99 +++ arch/sh/boards/se/7722/setup.c | 41 + arch/sh/configs/se7721_defconfig | 1085 ++++++++++++++++++++++++++ arch/sh/kernel/cf-enabler.c | 15 +- arch/sh/kernel/cpu/sh2a/Makefile | 7 +- arch/sh/kernel/cpu/sh2a/probe.c | 3 + arch/sh/kernel/cpu/sh2a/setup-mxg.c | 168 ++++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 +- arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 37 +- arch/sh/kernel/setup.c | 15 + arch/sh/lib/clear_page.S | 6 +- arch/sh/lib/copy_page.S | 6 +- arch/sh/mm/cache-debugfs.c | 4 +- arch/sh/mm/pmb.c | 2 +- arch/sh/tools/mach-types | 1 + drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/sh_keysc.c | 280 +++++++ drivers/rtc/rtc-sh.c | 296 +++++--- include/asm-sh/bugs.h | 2 +- include/asm-sh/migor.h | 58 ++ include/asm-sh/processor.h | 2 +- include/asm-sh/r7780rp.h | 22 +- include/asm-sh/se7721.h | 70 ++ include/asm-sh/se7722.h | 2 + include/asm-sh/sh_keysc.h | 13 + include/asm-sh/system.h | 2 + include/asm-sh/uaccess_32.h | 5 +- 35 files changed, 2258 insertions(+), 173 deletions(-) create mode 100644 arch/sh/boards/se/7721/Makefile create mode 100644 arch/sh/boards/se/7721/irq.c create mode 100644 arch/sh/boards/se/7721/setup.c create mode 100644 arch/sh/configs/se7721_defconfig create mode 100644 arch/sh/kernel/cpu/sh2a/setup-mxg.c create mode 100644 drivers/input/keyboard/sh_keysc.c create mode 100644 include/asm-sh/migor.h create mode 100644 include/asm-sh/se7721.h create mode 100644 include/asm-sh/sh_keysc.h ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Auto-merged net/9p/error.c Auto-merged net/9p/trans_fd.c Merge made by recursive. fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 52 ++++++++-- fs/9p/v9fs.h | 85 +++++++++++----- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 11 +- fs/9p/vfs_inode.c | 50 +++++++--- fs/9p/vfs_super.c | 1 + include/linux/parser.h | 2 +- include/net/9p/9p.h | 239 ++++++++++++++++++++++++++++++++++++++------ include/net/9p/client.h | 35 +++++++ include/net/9p/transport.h | 43 ++++++++ lib/parser.c | 32 ++++-- net/9p/client.c | 32 +++++-- net/9p/conv.c | 128 +++++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 175 +++++++++++++++++++++++++++------ net/9p/trans_virtio.c | 173 ++++++++++++++++++++++++++++---- net/9p/util.c | 32 +++++- 21 files changed, 966 insertions(+), 169 deletions(-) ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Auto-merged fs/xfs/xfs_iget.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 562 +++++++++++++++------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 ++++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 6 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/support/ktrace.c | 37 ++-- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 26 +- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 19 +- fs/xfs/xfs_mount.c | 49 ++- fs/xfs/xfs_mount.h | 24 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 1 - fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 38 +-- fs/xfs/xfs_vnodeops.c | 328 ++++++--------------- fs/xfs/xfs_vnodeops.h | 14 +- 41 files changed, 1042 insertions(+), 1431 deletions(-) ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Removed arch/xtensa/boot/ramdisk/Makefile Merge made by recursive. arch/xtensa/Kconfig | 65 ++++++++++++++++++++++++----------- arch/xtensa/Makefile | 68 +++++++++++++----------------------- arch/xtensa/boot/ramdisk/Makefile | 23 ------------ arch/xtensa/configs/iss_defconfig | 2 + arch/xtensa/mm/init.c | 1 - 5 files changed, 71 insertions(+), 88 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## ## # revert e14b8e9dd704ad37756c0a9ab14c7ccb1e398028 x86 ## Removed localversion-x86-latest.git Created commit 97a9295: Revert "x86: add x86-latest.git tag" 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 100644 localversion-x86-latest.git ## # merge x86 resolve /home/jejb/x86-fixup.diff ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/arm/Kconfig Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/reboot.c Auto-merged arch/x86/kernel/setup_32.c Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kernel/smp_32.c Removed arch/x86/kernel/smp_64.c Removed arch/x86/kernel/smpboot_64.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Removed arch/x86/lib/bitops_32.c Removed arch/x86/mach-rdc321x/wdt.c Removed arch/x86/mm/Makefile_32 Removed arch/x86/mm/Makefile_64 Auto-merged arch/x86/pci/acpi.c CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c Auto-merged arch/x86/pci/common.c Auto-merged arch/x86/pci/i386.c Auto-merged arch/x86/pci/pci.h CONFLICT (content): Merge conflict in arch/x86/pci/pci.h Auto-merged drivers/base/core.c Auto-merged drivers/misc/Makefile Auto-merged drivers/pci/pci-sysfs.c Auto-merged drivers/pci/probe.c Auto-merged drivers/serial/serial_core.c Removed include/asm-x86/mach-default/mach_reboot.h Removed include/asm-x86/nmi_32.h Removed include/asm-x86/nmi_64.h Removed include/asm-x86/pgalloc_32.h Removed include/asm-x86/pgalloc_64.h Auto-merged include/linux/ide.h Auto-merged include/linux/kernel.h Auto-merged include/linux/netdevice.h Auto-merged include/linux/pci.h Auto-merged include/linux/pci_ids.h Auto-merged include/linux/skbuff.h Auto-merged include/net/inet_sock.h Auto-merged include/net/tcp.h Auto-merged init/main.c Auto-merged lib/Kconfig.debug Created commit b29584b: Resolve Patch: /home/jejb/x86-fixup.diff ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## 2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f docbook-audit-prms.patch docsrc-spi-split-fix.patch kconfig_allconfig_docv2.patch move-smart-config.patch kerndoc-dup-section-name-err.patch ## # merge doc ## Auto-merged Documentation/00-INDEX Auto-merged kernel/audit.c Auto-merged scripts/kernel-doc Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/kbuild/00-INDEX | 4 + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ Documentation/{ => kbuild}/smart-config.txt | 2 +- Documentation/spi/spidev | 168 +----------------------- Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ README | 32 +++-- kernel/audit.c | 4 +- scripts/kernel-doc | 20 ++- 9 files changed, 388 insertions(+), 190 deletions(-) create mode 100644 Documentation/kbuild/make-configs.txt rename Documentation/{ => kbuild}/smart-config.txt (99%) create mode 100644 Documentation/spi/spidev_fdx.c ## # git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git testing lm-sensors ## Merge made by recursive. Documentation/hwmon/w83l785ts | 3 +- drivers/hwmon/adm1026.c | 22 ++++++--- drivers/hwmon/adm1029.c | 30 ++++++++----- drivers/hwmon/adm1031.c | 20 ++++++-- drivers/hwmon/adm9240.c | 20 ++++++--- drivers/hwmon/adt7470.c | 40 ++++++++++------- drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ drivers/hwmon/asb100.c | 20 +++++--- drivers/hwmon/dme1737.c | 5 ++ drivers/hwmon/f71805f.c | 5 ++ drivers/hwmon/f71882fg.c | 5 ++ drivers/hwmon/it87.c | 5 ++ drivers/hwmon/lm75.c | 5 +-- drivers/hwmon/pc87360.c | 6 +++ drivers/hwmon/pc87427.c | 5 ++ drivers/hwmon/sis5595.c | 5 ++ drivers/hwmon/smsc47b397.c | 22 ++++++++- drivers/hwmon/smsc47m1.c | 5 ++ drivers/hwmon/via686a.c | 5 ++ drivers/hwmon/vt1211.c | 5 ++ drivers/hwmon/vt8231.c | 5 ++ driver