Switched to branch "2.6.25-rc7-mc9" remote: Counting objects: 13, done. remote: Compressing objects: 14% (1/7) remote: Compressing objects: 28% (2/7) remote: Compressing objects: 42% (3/7) remote: Compressing objects: 57% (4/7) remote: Compressing objects: 71% (5/7) remote: Compressing objects: 85% (6/7) remote: Compressing objects: 100% (7/7) remote: Compressing objects: 100% (7/7), done. remote: Total 7 (delta 6), reused 0 (delta 0) From /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 7da0922..d0662c8 master -> scsi-misc Switched to branch "ide" Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc7-mc9" 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-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Switched to branch "gregkh-ldp" .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. .dotest/patch:58: trailing whitespace. obj-$(CONFIG_SLICOSS) += slicoss.o .dotest/patch:24450: space before tab in indent. ushort DramRomFn; // 14 Dram/Rom function warning: 2 lines add whitespace errors. Switched to branch "2.6.25-rc7-mc9" error: branch 'agp' not found. Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "i2c" Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" remote: Counting objects: 99, done. remote: Compressing objects: 1% (1/82) remote: Compressing objects: 2% (2/82) remote: Compressing objects: 3% (3/82) remote: Compressing objects :remote: 4% (4/82) remote: Compressing objects: 6% (5/82) remote: Compressing objects: 7% (6/82) remote: Compressing objects: 8% (7/82) remote: Com premote: ressing objects: 9% (8/82) remote: Compressing objects: 10% (9/82) remote: Compressing objects: 12% (10/82) remote: Compressing objects: 13% (11/82) remote: Compressing objects: 14% (12/82) remote: Compressing obje cremote: ts: 15% (13/82) remote: Compressing objects: 17% (14/82) remote: Compressing objects: 18% (15/82) remote: Compressing objects: 19% (16/82) remote: remote: Compressing objects: 20% (17/82) remote: Compressing objects: 21% (18/82) remote: Compressing objects: 23% (19/82) remote: Compressing objects: 24% (20/82) remote: Compressing objects: 25% (21/82) remote: Compressing objects: 26% (22/82) remote: Compressing objects: 28% (23/82) remote: Compressing objects: 29% (24/82) remote: Compressing objects: 30% (25/82) remote: Compressing objects: 31% (26/82) remote: Compressing objects: 32% (27/82) remote: Compressing objects: 34% (28/82) remote: Compressing objects: 35% (29/82) remote: Compressing objects: 36% (30/82) remote: Compressing objects: 37% (31/82) remote: Compressing objects: 39% (32/82) remote: Compressing objects: 40% (33/82) remote: Compressing objects: 41% (34/82) remote: Compressing objects: 42% (35/82) remote: Compressing objects: 43% (36/82) remote: Compressing objects: 45% (37/82) remote: Compressing objects: 46% (38/82) remote: Compressing objects: 47% (39/82) remote: Compressing objects: 48% (40/82) remote: Compressing objects: 50% (41/82) remote: Compressing objects: 51% (42/82) remote: Compressing objects: 52% (43/82) remote: Compressing objects: 53% (44/82) remote: Compressing objects: 54% (45/82) remote: Compressing objects: 56% (46/82) remote: Compressing objects: 57% (47/82) remote: Compressing objects: 58% (48/82) remote: Compressing objects: 59% (49/82) remote: Compressing objects: 60% (50/82) remote: Compressing objects: 62% (51/82) remote: Compressing objects: 63% (52/82) remote: Compressing objects: 64% (53/82) remote: Compressing objects: 65% (54/82) remote: Compressing objects: 67% (55/82) remote: Compressing objects: 68% (56/82) remote: Compressing objects: 69% (57/82) remote: Compressing objects: 70% (58/82) remote: Compressing objects: 71% (59/82) remote: Compressing objects: 73% (60/82) remote: Compressing objects: 74% (61/82) remote: Compressing objects: 75% (62/82) remote: Compressing objects: 76% (63/82) remote: Compressing objects: 78% (64/82) remote: Compressing objects: 79% (65/82) remote: Compressing objects: 80% (66/82) remote: Compressing objects: 81% (67/82) remote: Compressing objects: 82% (68/82) remote: Compressing objects: 84% (69/82) remote: Compressing objects: 85% (70/82) remote: Compressing objects: 86% (71/82) remote: Compressing objects: 87% (72/82) remote: Compressing objects: 89% (73/82) remote: Compressing objects: 90% (74/82) remote: Compressing objects: 91% (75/82) remote: Compressing objects: 92% (76/82) remote: Compressing objects: 93% (77/82) remote: Compressing objects: 95% (78/82) remote: Compressing objects: 96% (79/82) remote: Compressing objects: 97% (80/82) remote: Compressing objects: 98% (81/82) remote: Compressing objects: 100% (82/82) remote: Compressing objects: 100% (82/82), done. remote: Total 82 (delta 69), reused 0 (delta 0) From /pub/scm/linux/kernel/git/jikos/hid eaca4ad..7ffcd91 upstream -> hid-upstream remote: Counting objects: 1 remote: Counting objects: 6 remote: Counting objects: 43, done. remote: Compressing objects: 4% (1/25) remote: Compressing objects: 8% (2/25) remote: Compressing objects: 12% (3/25) remote: Compressing objects :remote: 16% (4/25) remote: Compressing objects: 20% (5/25) remote: Compressing objects: 24% (6/25) remote: Compressing objects: 28% (7/25) remote: Com premote: ressing objects: 32% (8/25) remote: Compressing objects: 36% (9/25) remote: Compressing objects: 40% (10/25) remote: Compressing objects: 4remote: 4% (11/25) remote: Compressing objects: 48% (12/25) remote: Compressing objects: 52% (13/25) remote: Compressing objects: 56% (14/25) remote: Compressing objects: 60% (15/25) remote: Compressing obje cremote: ts: 64% (16/25) remote: Compressing objects: 68% (17/25) remote: Compressing objects: 72% (18/25) remote: Compressing objects: 76% (19/25) remote: remote: Compressing objects: 80% (20/25) remote: Compressing objects: 84% (21/25) remote: Compressing objects: 88% (22/25) remote: Compressing o bremote: jects: 92% (23/25) remote: Compressing objects: 96% (24/25) remote: Compressing objects: 100% (25/25) remote: Compressing objects: 100% (25/ 2remote: 5), done. remote: Total 25 (delta 21), reused 0 (delta 0) From /pub/scm/linux/kernel/git/dtor/input 481419e..a7097ff for-linus -> input From /pub/scm/linux/kernel/git/dtor/input 3c00bb9..a7097ff master -> input-devel remote: Counting objects: 59, done. remote: Compressing objects: 14% (1/7) remote: Compressing objects: 28% (2/7) remote: Compressing objects: 42% (3/ 7remote: ) remote: Compressing objects: 57% (4/7) remote: Compressing objects: 71% (5/7) remote: Compressing objects: 85% (6/7) remote: Compressing objec tremote: s: 100% (7/7) remote: Compressing objects: 100% (7/7), done. remote: Total 23 (delta 21), reused 18 (delta 16) From /pub/scm/linux/kernel/git/avi/kvm 2ac530f..78e0016 master -> kvm remote: Counting objects: 1 remote: Counting objects: 14, done. remote: Compressing objects: 25% (1/4) remote: Compressing objects: 50% (2/4) remote: Compressing objects: 75% (3/4) remote: Compressing objects: 100% (4/4) remote: Compressing objects: 100% (4/4), done. remote: Total 10 (delta 8), reused 8 (delta 6) From git://git.o-hand.com/linux-rpurdie-leds d39a7a6..306dd85 for-linus -> leds From /pub/scm/linux/kernel/git/roland/infiniband + c1ad065...3b66743 for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. www.linux-mips.org[0: 84.159.126.90]: errno=Connection refused fatal: unable to connect a socket (Connection refused) www.linux-mips.org[0: 84.159.126.90]: errno=Connection refused fatal: unable to connect a socket (Connection refused) remote: Counting objects: 78, done. remote: Compressing objects: 1% (1/56) remote: Compressing objects: 3% (2/56) remote: Compressing objects: 5% (3/56) remote: Compressing objects: 7% (4/56) remote: Compressing objects: 8% (5/56) remote: Compressing objects: 10% (6/56) remote: Compressing objects: 12% (7/56) remote: Compressing objects: 14% (8/56) remote: Compressing objects: 16% (9/56) remote: Compressing objects: 17% (10/56) remote: Compressing objects: 19% (11/56) remote: Compressing objects: 21% (12/56) remote: Compressing objects: 23% (13/56) remote: Compressing objects: 25% (14/56) remote: Compressing objects: 26% (15/56) remote: Compressing objects: 28% (16/56) remote: Compressing objects: 30% (17/56) remote: Compressing objects: 32% (18/56) remote: Compressing objects: 33% (19/56) remote: Compressing objects: 35% (20/56) remote: Compressing objects: 37% (21/56) remote: Compressing objects: 39% (22/56) remote: Compressing objects: 41% (23/56) remote: Compressing objects: 42% (24/56) remote: Compressing objects: 44% (25/56) remote: Compressing objects: 46% (26/56) remote: Compressing objects: 48% (27/56) remote: Compressing objects: 50% (28/56) remote: Compressing objects: 51% (29/56) remote: Compressing objects: 53% (30/56) remote: Compressing objects: 55% (31/56) remote: Compressing objects: 57% (32/56) remote: Compressing objects: 58% (33/56) remote: Compressing objects: 60% (34/56) remote: Compressing objects: 62% (35/56) remote: Compressing objects: 64% (36/56) remote: Compressing objects: 66% (37/56) remote: Compressing objects: 67% (38/56) remote: Compressing objects: 69% (39/56) remote: Compressing objects: 71% (40/56) remote: Compressing objects: 73% (41/56) remote: Compressing objects: 75% (42/56) remote: Compressing objects: 76% (43/56) remote: Compressing objects: 78% (44/56) remote: Compressing objects: 80% (45/56) remote: Compressing objects: 82% (46/56) remote: Compressing objects: 83% (47/56) remote: Compressing objects: 85% (48/56) remote: Compressing objects: 87% (49/56) remote: Compressing objects: 89% (50/56) remote: Compressing objects: 91% (51/56) remote: Compressing objects: 92% (52/56) remote: Compressing objects: 94% (53/56) remote: Compressing objects: 96% (54/56) remote: Compressing objects: 98% (55/56) remote: Compressing objects: 100% (56/56) remote: Compressing objects: 100% (56/56), done. remote: Total 56 (delta 49), reused 0 (delta 0) From /pub/scm/linux/kernel/git/davem/net-2.6.26 3edf8fa..dfb12eb master -> net Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "doc" Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" remote: Counting objects: 35, done. remote: Compressing objects: 5% (1/18) remote: Compressing objects: 11% (2/18) remote: Compressing objects: 16% (3/18) remote: Compressing objects :remote: 22% (4/18) remote: Compressing objects: 27% (5/18) remote: Compressing objects: 33% (6/18) remote: Compressing objects: 38% (7/18) remote: Com premote: ressing objects: 44% (8/18) remote: Compressing objects: 50% (9/18) remote: Compressing objects: 55% (10/18) remote: Compressing objects: 6remote: 1% (11/18) remote: Compressing objects: 66% (12/18) remote: Compressing objects: 72% (13/18) remote: Compressing objects: 77% (14/18) remote: Co mremote: pressing objects: 83% (15/18) remote: Compressing objects: 88% (16/18) remote: Compressing objects: 94% (17/18) remote: Compressing objects :remote: 100% (18/18) remote: Compressing objects: 100% (18/18), done. remote: Total 25 (delta 21), reused 10 (delta 7) From /pub/scm/linux/kernel/git/teigland/dlm 1cbc894..0c6ef04 next -> dlm From /pub/scm/linux/kernel/git/cooloney/blackfin-2.6 1309d4e..bde4f8f for-linus -> blackfin Switched to branch "m68k" .dotest/patch:868: space before tab in indent. break; .dotest/patch:870: space before tab in indent. } while (--poll_count); .dotest/patch:875: space before tab in indent. if (!poll_count) { .dotest/patch:880: space before tab in indent. } else { .dotest/patch:1631: space before tab in indent. shouldn't this be a given if we have it here ? */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Switched to branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 440, done. remote: Compressing objects: 0% (1/136) remote: Compressing objects: 1% (2/136) remote: Compressing objects: 2% (3/136) remote: Compressing obje cremote: ts: 3% (5/136) remote: Compressing objects: 4% (6/136) remote: Compressing objects: 5% (7/136) remote: Compressing objects: 6% (9/136) remote: Compressing objects: 7% (10/136) remote: Compressing objects: 8% (11/136) remote: Compressing ob jremote: ects: 9% (13/136) remote: Compressing objects: 10% (14/136) remote: Compressing objects: 11% (15/136) remote: Compressing objects: 12% (1 7remote: /136) remote: Compressing objects: 13% (18/136) remote: Compressing objects: 14% (20/136) remote: Compressing objects: 15% (21/136) remote: Compressing objects: 16% (22/136) remote: Compressing objects: 17% (24/136) remote: Compressing objects: 18% (25/136) remote: Compressing objects: 19% (26/136) remote: Compressing objects: 20% (28/136) remote: Compressing objects: 21% (29/136) remote: Compressing objects: 22% (30/136) remote: Compressing objects: 23% (32/136) remote: Compressing objects: 24% (33/136) remote: Compressing objects: 25% (34/136) remote: Compressing objects: 26% (36/136) remote: Compressing objects: 27% (37/136) remote: Compressing objects: 28% (39/136) remote: Compressing objects: 29% (40/136) remote: Compressing objects: 30% (41/136) remote: Compressing objects: 31% (43/136) remote: Compressing objects: 32% (44/136) remote: Compressing objects: 33% (45/136) remote: Compressing objects: 34% (47/136) remote: Compressing objects: 35% (48/136) remote: Compressing objects: 36% (49/136) remote: Compressing objects: 37% (51/136) remote: Compressing objects: 38% (52/136) remote: Compressing objects: 39% (54/136) remote: Compressing objects: 40% (55/136) remote: Compressing objects: 41% (56/136) remote: Compressing objects: 42% (58/136) remote: Compressing objects: 43% (59/136) remote: Compressing objects: 44% (60/136) remote: Compressing objects: 45% (62/136) remote: Compressing objects: 46% (63/136) remote: Compressing objects: 47% (64/136) remote: Compressing objects: 48% (66/136) remote: Compressing objects: 49% (67/136) remote: Compressing objects: 50% (68/136) remote: Compressing objects: 51% (70/136) remote: Compressing objects: 52% (71/136) remote: Compressing objects: 53% (73/136) remote: Compressing objects: 54% (74/136) remote: Compressing objects: 55% (75/136) remote: Compressing objects: 56% (77/136) remote: Compressing objects: 57% (78/136) remote: Compressing objects: 58% (79/136) remote: Compressing objects: 59% (81/136) remote: Compressing objects: 60% (82/136) remote: Compressing objects: 61% (83/136) remote: Compressing objects: 62% (85/136) remote: Compressing objects: 63% (86/136) remote: Compressing objects: 64% (88/136) remote: Compressing objects: 65% (89/136) remote: Compressing objects: 66% (90/136) remote: Compressing objects: 67% (92/136) remote: Compressing objects: 68% (93/136) remote: Compressing objects: 69% (94/136) remote: Compressing objects: 70% (96/136) remote: Compressing objects: 71% (97/136) remote: Compressing objects: 72% (98/136) remote: Compressing objects: 73% (100/136) remote: Compressing objects: 74% (101/136) remote: Compressing objects: 75% (102/136) remote: Compressing objects: 76% (104/136) remote: Compressing objects: 77% (105/136) remote: Compressing objects: 78% (107/136) remote: Compressing objects: 79% (108/136) remote: Compressing objects: 80% (109/136) remote: Compressing objects: 81% (111/136) remote: Compressing objects: 82% (112/136) remote: Compressing objects: 83% (113/136) remote: Compressing objects: 84% (115/136) remote: Compressing objects: 85% (116/136) remote: Compressing objects: 86% (117/136) remote: Compressing objects: 87% (119/136) remote: Compressing objects: 88% (120/136) remote: Compressing objects: 89% (122/136) remote: Compressing objects: 90% (123/136) remote: Compressing objects: 91% (124/136) remote: Compressing objects: 92% (126/136) remote: Compressing objects: 93% (127/136) remote: Compressing objects: 94% (128/136) remote: Compressing objects: 95% (130/136) remote: Compressing objects: 96% (131/136) remote: Compressing objects: 97% (132/136) remote: Compressing objects: 98% (134/136) remote: Compressing objects: 99% (135/136) remote: Compressing objects: 100% (136/136) remote: Compressing objects: 100% (136/136), done. Receiving objects: 0% (1/339) Receiving objects: 1% (4/339) Receiving objects: 2% (7/339) Receiving objects: 3% (11/339) Receiving objects: 4% (14/339) Receiving objects: 5% (17/339) Receiving objects: 6% (21/339) Receiving objects: 7% (24/339) Receiving objects: 8% (28/339) Receiving objects: 9% (31/339) Receiving objects: 10% (34/339) Receiving objects: 11% (38/339) Receiving objects: 12% (41/339) Receiving objects: 13% (45/339) Receiving objects: 14% (48/339) Receiving objects: 15% (51/339) Receiving objects: 16% (55/339) Receiving objects: 17% (58/339) Receiving objects: 18% (62/339) Receiving objects: 19% (65/339) Receiving objects: 20% (68/339) Receiving objects: 21% (72/339) Receiving objects: 22% (75/339) Receiving objects: 23% (78/339) Receiving objects: 24% (82/339) Receiving objects: 25% (85/339) Receiving objects: 26% (89/339) Receiving objects: 27% (92/339) Receiving objects: 28% (95/339) Receiving objects: 29% (99/339) Receiving objects: 30% (102/339) Receiving objects: 31% (106/339) Receiving objects: 32% (109/339) Receiving objects: 33% (112/339) Receiving objects: 34% (116/339) Receiving objects: 35% (119/339) Receiving objects: 36% (123/339) Receiving objects: 37% (126/339) Receiving objects: 38% (129/339) Receiving objects: 39% (133/339) Receiving objects: 40% (136/339) Receiving objects: 41% (139/339) Receiving objects: 42% (143/339) Receiving objects: 43% (146/339) Receiving objects: 44% (150/339) Receiving objects: 45% (153/339) Receiving objects: 46% (156/339) Receiving objects: 47% (160/339) Receiving objects: 48% (163/339) Receiving objects: 49% (167/339) Receiving objects: 50% (170/339) Receiving objects: 51% (173/339) Receiving objects: 52% (177/339) Receiving objects: 53% (180/339) Receiving objects: 54% (184/339) Receiving objects: 55% (187/339) Receiving objects: 56% (190/339) Receiving objects: 57% (194/339) Receiving objects: 58% (197/339) Receiving objects: 59% (201/339) Receiving objects: 60% (204/339) Receiving objects: 61% (207/339) Receiving objects: 62% (211/339) Receiving objects: 63% (214/339) Receiving objects: 64% (217/339) Receiving objects: 65% (221/339) Receiving objects: 66% (224/339) Receiving objects: 67% (228/339) Receiving objects: 68% (231/339) Receiving objects: 69% (234/339) Receiving objects: 70% (238/339) Receiving objects: 71% (241/339) Receiving objects: 72% (245/339) Receiving objects: 73% (248/339) Receiving objects: 74% (251/339) Receiving objects: 75% (255/339) remote: Total 339 (delta 294), reused 247 (delta 202) Receiving objects: 76% (258/339) Receiving objects: 77% (262/339) Receiving objects: 78% (265/339) Receiving objects: 79% (268/339) Receiving objects: 80% (272/339) Receiving objects: 81% (275/339) Receiving objects: 82% (278/339) Receiving objects: 83% (282/339) Receiving objects: 84% (285/339) Receiving objects: 85% (289/339) Receiving objects: 86% (292/339) Receiving objects: 87% (295/339) Receiving objects: 88% (299/339) Receiving objects: 89% (302/339) Receiving objects: 90% (306/339) Receiving objects: 91% (309/339) Receiving objects: 92% (312/339) Receiving objects: 93% (316/339) Receiving objects: 94% (319/339) Receiving objects: 95% (323/339) Receiving objects: 96% (326/339) Receiving objects: 97% (329/339) Receiving objects: 98% (333/339) Receiving objects: 99% (336/339) Receiving objects: 100% (339/339) Receiving objects: 100% (339/339), 78.20 KiB, done. Resolving deltas: 1% (4/294) Resolving deltas: 2% (8/294) Resolving deltas: 17% (51/294) Resolving deltas: 31% (94/294) Resolving deltas: 35% (105/294) Resolving deltas: 36% (108/294) Resolving deltas: 42% (125/294) Resolving deltas: 43% (127/294) Resolving deltas: 44% (131/294) Resolving deltas: 45% (134/294) Resolving deltas: 46% (136/294) Resolving deltas: 47% (139/294) Resolving deltas: 48% (142/294) Resolving deltas: 49% (145/294) Resolving deltas: 50% (147/294) Resolving deltas: 51% (150/294) Resolving deltas: 54% (161/294) Resolving deltas: 55% (162/294) Resolving deltas: 57% (170/294) Resolving deltas: 58% (171/294) Resolving deltas: 59% (176/294) Resolving deltas: 60% (177/294) Resolving deltas: 62% (185/294) Resolving deltas: 63% (187/294) Resolving deltas: 64% (189/294) Resolving deltas: 65% (192/294) Resolving deltas: 66% (196/294) Resolving deltas: 67% (197/294) Resolving deltas: 68% (201/294) Resolving deltas: 69% (203/294) Resolving deltas: 70% (208/294) Resolving deltas: 72% (212/294) Resolving deltas: 73% (215/294) Resolving deltas: 74% (218/294) Resolving deltas: 75% (221/294) Resolving deltas: 76% (224/294) Resolving deltas: 77% (227/294) Resolving deltas: 78% (230/294) Resolving deltas: 79% (233/294) Resolving deltas: 80% (236/294) Resolving deltas: 87% (256/294) Resolving deltas: 88% (260/294) Resolving deltas: 90% (265/294) Resolving deltas: 93% (274/294) Resolving deltas: 94% (278/294) Resolving deltas: 95% (280/294) Resolving deltas: 96% (283/294) Resolving deltas: 97% (286/294) Resolving deltas: 98% (289/294) Resolving deltas: 99% (292/294) Resolving deltas: 100% (294/294) Resolving deltas: 100% (294/294), completed with 91 local objects. From /pub/scm/linux/kernel/git/viro/vfs-2.6 * [new branch] vfs-2.6.25 -> vfs Already on branch "2.6.25-rc7-mc9" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1 remote: Counting objects: 587, done. remote: Compressing objects: 0% (1/112) remote: Compressing objects: 1% (2/112) remote: Compressing objects: 2% (3/112) remote: Compressing obje cremote: ts: 3% (4/112) remote: Compressing objects: 4% (5/112) remote: Compressing objects: 5% (6/112) remote: Compressing objects: 6% (7/112) remote: remote: Compressing objects: 7% (8/112) remote: Compressing objects: 8% (9/112) remote: Compressing objects: 9% (11/112) remote: Compressing oremote: bjects: 10% (12/112) remote: Compressing objects: 11% (13/112) remote: Compressing objects: 12% (14/112) remote: Compressing objects: 13% (15/112) remote: Compressing objects: 14% (16/112) remote: Compressing objects: 15% (17/112) remote: Compressing o bremote: jects: 16% (18/112) remote: Compressing objects: 17% (20/112) remote: Compressing objects: 18% (21/112) remote: Compressing objects: 19% ( 2remote: 2/112) remote: Compressing objects: 20% (23/112) remote: Compressing objects: 21% (24/112) remote: Compressing objects: 22% (25/112) remote: Compressing objects: 23% (26/112) remote: Compressing objects: 24% (27/112) remote: Compressing objects: 25% (28/112) remote: Compressing objects: 26% (30/112) remote: Compressing objects: 27% (31/112) remote: Compressing objects: 28% (32/112) remote: Compressing objects: 29% (33/112) remote: Compressing objects: 30% (34/112) remote: Compressing objects: 31% (35/112) remote: Compressing objects: 32% (36/112) remote: Compressing objects: 33% (37/112) remote: Compressing objects: 34% (39/112) remote: Compressing objects: 35% (40/112) remote: Compressing objects: 36% (41/112) remote: Compressing objects: 37% (42/112) remote: Compressing objects: 38% (43/112) remote: Compressing objects: 39% (44/112) remote: Compressing objects: 40% (45/112) remote: Compressing objects: 41% (46/112) remote: Compressing objects: 42% (48/112) remote: Compressing objects: 43% (49/112) remote: Compressing objects: 44% (50/112) remote: Compressing objects: 45% (51/112) remote: Compressing objects: 46% (52/112) remote: Compressing objects: 47% (53/112) remote: Compressing objects: 48% (54/112) remote: Compressing objects: 49% (55/112) remote: Compressing objects: 50% (56/112) remote: Compressing objects: 51% (58/112) remote: Compressing objects: 52% (59/112) remote: Compressing objects: 53% (60/112) remote: Compressing objects: 54% (61/112) remote: Compressing objects: 55% (62/112) remote: Compressing objects: 56% (63/112) remote: Compressing objects: 57% (64/112) remote: Compressing objects: 58% (65/112) remote: Compressing objects: 59% (67/112) remote: Compressing objects: 60% (68/112) remote: Compressing objects: 61% (69/112) remote: Compressing objects: 62% (70/112) remote: Compressing objects: 63% (71/112) remote: Compressing objects: 64% (72/112) remote: Compressing objects: 65% (73/112) remote: Compressing objects: 66% (74/112) remote: Compressing objects: 67% (76/112) remote: Compressing objects: 68% (77/112) remote: Compressing objects: 69% (78/112) remote: Compressing objects: 70% (79/112) remote: Compressing objects: 71% (80/112) remote: Compressing objects: 72% (81/112) remote: Compressing objects: 73% (82/112) remote: Compressing objects: 74% (83/112) remote: Compressing objects: 75% (84/112) remote: Compressing objects: 76% (86/112) remote: Compressing objects: 77% (87/112) remote: Compressing objects: 78% (88/112) remote: Compressing objects: 79% (89/112) remote: Compressing objects: 80% (90/112) remote: Compressing objects: 81% (91/112) remote: Compressing objects: 82% (92/112) remote: Compressing objects: 83% (93/112) remote: Compressing objects: 84% (95/112) remote: Compressing objects: 85% (96/112) remote: Compressing objects: 86% (97/112) remote: Compressing objects: 87% (98/112) remote: Compressing objects: 88% (99/112) remote: Compressing objects: 89% (100/112) remote: Compressing objects: 90% (101/112) remote: Compressing objects: 91% (102/112) remote: Compressing objects: 92% (104/112) remote: Compressing objects: 93% (105/112) remote: Compressing objects: 94% (106/112) remote: Compressing objects: 95% (107/112) remote: Compressing objects: 96% (108/112) remote: Compressing objects: 97% (109/112) remote: Compressing objects: 98% (110/112) remote: Compressing objects: 99% (111/112) remote: Compressing objects: 100% (112/112) remote: Compressing objects: 100% (112/112), done. Receiving objects: 0% (1/413) Receiving objects: 1% (5/413) Receiving objects: 2% (9/413) Receiving objects: 3% (13/413) Receiving objects: 4% (17/413) Receiving objects: 5% (21/413) Receiving objects: 6% (25/413) Receiving objects: 7% (29/413) Receiving objects: 8% (34/413) Receiving objects: 9% (38/413) Receiving objects: 10% (42/413) Receiving objects: 11% (46/413) Receiving objects: 12% (50/413) Receiving objects: 13% (54/413) Receiving objects: 14% (58/413) Receiving objects: 15% (62/413) Receiving objects: 16% (67/413) Receiving objects: 17% (71/413) Receiving objects: 18% (75/413) Receiving objects: 19% (79/413) Receiving objects: 20% (83/413) Receiving objects: 21% (87/413) Receiving objects: 22% (91/413) Receiving objects: 23% (95/413) Receiving objects: 24% (100/413) Receiving objects: 25% (104/413) Receiving objects: 26% (108/413) Receiving objects: 27% (112/413) Receiving objects: 28% (116/413) Receiving objects: 29% (120/413) Receiving objects: 30% (124/413) Receiving objects: 31% (129/413) Receiving objects: 32% (133/413) Receiving objects: 33% (137/413) Receiving objects: 34% (141/413) Receiving objects: 35% (145/413) Receiving objects: 36% (149/413) Receiving objects: 37% (153/413) Receiving objects: 38% (157/413) Receiving objects: 39% (162/413) Receiving objects: 40% (166/413) Receiving objects: 41% (170/413) Receiving objects: 42% (174/413) Receiving objects: 43% (178/413) Receiving objects: 44% (182/413) Receiving objects: 45% (186/413) Receiving objects: 46% (190/413) Receiving objects: 47% (195/413) Receiving objects: 48% (199/413) Receiving objects: 49% (203/413) Receiving objects: 50% (207/413) Receiving objects: 51% (211/413) Receiving objects: 52% (215/413) Receiving objects: 53% (219/413) Receiving objects: 54% (224/413) Receiving objects: 55% (228/413) Receiving objects: 56% (232/413) Receiving objects: 57% (236/413) Receiving objects: 58% (240/413) Receiving objects: 59% (244/413) Receiving objects: 60% (248/413) Receiving objects: 61% (252/413) Receiving objects: 62% (257/413) Receiving objects: 63% (261/413) Receiving objects: 64% (265/413) Receiving objects: 65% (269/413) Receiving objects: 66% (273/413) Receiving objects: 67% (277/413) Receiving objects: 68% (281/413) Receiving objects: 69% (285/413) Receiving objects: 70% (290/413) Receiving objects: 71% (294/413) Receiving objects: 72% (298/413) Receiving objects: 73% (302/413) Receiving objects: 74% (306/413) Receiving objects: 75% (310/413) Receiving objects: 76% (314/413) Receiving objects: 77% (319/413) Receiving objects: 78% (323/413) Receiving objects: 79% (327/413) Receiving objects: 80% (331/413) Receiving objects: 81% (335/413) Receiving objects: 82% (339/413) Receiving objects: 83% (343/413) Receiving objects: 84% (347/413) Receiving objects: 85% (352/413) Receiving objects: 86% (356/413) Receiving objects: 87% (360/413) Receiving objects: 88% (364/413) Receiving objects: 89% (368/413) Receiving objects: 90% (372/413) Receiving objects: 91% (376/413) Receiving objects: 92% (380/413) Receiving objects: 93% (385/413) Receiving objects: 94% (389/413) Receiving objects: 95% (393/413) Receiving objects: 96% (397/413) Receiving objects: 97% (401/413) Receiving objects: 98% (405/413) Receiving objects: 99% (409/413) Receiving objects: 100% (413/413) Receiving objects: 100% (413/413), 74.62 KiB, done. Resolving deltas: 0% (2/360) Resolving deltas: 1% (5/360) Resolving deltas: 3% (13/360) Resolving deltas: 4% (16/360) Resolving deltas: 5% (18/360) Resolving deltas: 6% (25/360) Resolving deltas: 7% (26/360) Resolving deltas: 8% (32/360) Resolving deltas: 10% (37/360) Resolving deltas: 11% (40/360) Resolving deltas: 12% (44/360) Resolving deltas: 13% (47/360) Resolving deltas: 15% (57/360) Resolving deltas: 16% (58/360) Resolving deltas: 17% (62/360) Resolving deltas: 18% (66/360) Resolving deltas: 19% (69/360) Resolving deltas: 20% (72/360) Resolving deltas: 21% (79/360) Resolving deltas: 22% (80/360) Resolving deltas: 23% (84/360) Resolving deltas: 24% (87/360) remote: Total 413 (delta 360), reused 352 (delta 301) Resolving deltas: 25% (90/360) Resolving deltas: 29% (106/360) Resolving deltas: 30% (108/360) Resolving deltas: 31% (113/360) Resolving deltas: 32% (116/360) Resolving deltas: 33% (121/360) Resolving deltas: 34% (124/360) Resolving deltas: 35% (127/360) Resolving deltas: 36% (130/360) Resolving deltas: 37% (134/360) Resolving deltas: 40% (146/360) Resolving deltas: 41% (148/360) Resolving deltas: 42% (154/360) Resolving deltas: 43% (155/360) Resolving deltas: 44% (159/360) Resolving deltas: 45% (163/360) Resolving deltas: 46% (166/360) Resolving deltas: 47% (170/360) Resolving deltas: 48% (173/360) Resolving deltas: 49% (178/360) Resolving deltas: 50% (180/360) Resolving deltas: 51% (186/360) Resolving deltas: 52% (188/360) Resolving deltas: 54% (197/360) Resolving deltas: 55% (198/360) Resolving deltas: 61% (221/360) Resolving deltas: 67% (242/360) Resolving deltas: 72% (262/360) Resolving deltas: 73% (263/360) Resolving deltas: 75% (270/360) Resolving deltas: 76% (274/360) Resolving deltas: 79% (287/360) Resolving deltas: 82% (296/360) Resolving deltas: 84% (304/360) Resolving deltas: 85% (307/360) Resolving deltas: 86% (313/360) Resolving deltas: 87% (314/360) Resolving deltas: 88% (317/360) Resolving deltas: 89% (322/360) Resolving deltas: 90% (326/360) Resolving deltas: 92% (333/360) Resolving deltas: 94% (340/360) Resolving deltas: 96% (346/360) Resolving deltas: 97% (350/360) Resolving deltas: 98% (353/360) Resolving deltas: 99% (357/360) Resolving deltas: 100% (360/360) Resolving deltas: 100% (360/360), completed with 126 local objects. From /pub/scm/linux/kernel/git/galak/powerpc * [new branch] powerpc-next -> powerpc1 4d9516: Revert "driver core: debug for bad dev_attr_show() return value." 2 files changed, 1 insertions(+), 12 deletions(-) Created commit 265878a: Revert "sysdev: detect multiple driver registrations" 1 files changed, 0 insertions(+), 16 deletions(-) Created commit 5b92f83: Revert "driver core: cpu: fix section mismatch in cpu.c:store_online" 1 files changed, 2 insertions(+), 2 deletions(-) Created commit b4837ab: 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 dbe71ed: Revert "power_state: remove it from driver core" 1 files changed, 5 insertions(+), 0 deletions(-) Auto-merged scripts/mod/file2alias.c Created commit 1ad07b9: Revert "PNP: add all PNP card device id's as individual aliases" 1 files changed, 13 insertions(+), 44 deletions(-) Created commit 18a2c89: Revert "firmware: clean up samples for coding style issues" 2 files changed, 38 insertions(+), 40 deletions(-) Created commit 940a392: 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 b6af8d4: Revert "sysfs: small header file cleanup for SYSFS=n" 1 files changed, 7 insertions(+), 2 deletions(-) Created commit 5ae8b19: Revert "driver core: register_memory/unregister_memory clean ups and bugfix" 1 files changed, 15 insertions(+), 7 deletions(-) Created commit dc0cc73: Revert "driver core: memory: semaphore to mutex" 3 files changed, 7 insertions(+), 7 deletions(-) Auto-merged MAINTAINERS Removed drivers/uio/uio_smx.c Created commit 2bd0492: 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 5e64d16: Revert "UIO: Remove needless PCI_DEVICE_ID definition from uio_cif.c" 1 files changed, 4 insertions(+), 0 deletions(-) Created commit 1c1222f: Revert "UIO: arch/arm/Kconfig: Make UIO available on ARM architecture" 1 files changed, 0 insertions(+), 2 deletions(-) Created commit f2ca3c7: Revert "uio: mark pci_device_id hilscher_pci_ids[] __devinitdata" 1 files changed, 1 insertions(+), 1 deletions(-) Created commit 92a7a83: Revert "uio: Kconfig improvements" 1 files changed, 5 insertions(+), 5 deletions(-) Created commit 6937189: Revert "kobject: catch kobjects that are not initialized" 1 files changed, 1 insertions(+), 8 deletions(-) Created commit 991f904: Revert "UIO: add pgprot_noncached() to UIO mmap code" 1 files changed, 0 insertions(+), 2 deletions(-) Auto-merged MAINTAINERS Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-scsi.c Auto-merged include/linux/libata.h Auto-merged scripts/mod/file2alias.c 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 resolve /home/jejb/gregkh-driver-fixup.diff ## Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/hosts.c CONFLICT (content): Merge conflict in drivers/scsi/hosts.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/raid_class.c Auto-merged drivers/scsi/scsi_sysfs.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.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 Created commit 3657f5f: Resolve Patch: /home/jejb/gregkh-driver-fixup.diff ## # 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-rb-tree-setup-tweak.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-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 438409 bytes received 972 bytes 292920.67 bytes/sec total size is 433390 speedup is 0.99 Using base gregkh-driver pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit 3f951f3: 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-usb-serial-spcp8x5-driver.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.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-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-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-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 898559 bytes received 1522 bytes 1800162.00 bytes/sec total size is 890324 speedup is 0.99 Using base gregkh-pci usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-cypress_m8-speed-handling.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch usb-usb.h-reduce-syslog-clutter.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch ub-drop-bug-and-update-small-things.patch usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-add-usb-serial-spcp8x5-driver.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- drivers/block/ub.c | 76 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +++++--- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/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 | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 ++-- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 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 | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 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 | 20 +- drivers/usb/misc/adutux.c | 120 ++-- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 ++-- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 ++-- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 ++-- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++++++------- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 ++-- drivers/usb/serial/garmin_gps.c | 112 ++-- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 ++++---- drivers/usb/serial/io_ti.c | 392 +++++----- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 ++-- drivers/usb/serial/keyspan.c | 262 +++--- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 ++-- drivers/usb/serial/mos7840.c | 159 ++-- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 ++-- drivers/usb/serial/pl2303.c | 112 ++-- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 66 +- drivers/usb/serial/spcp8x5.c | 1075 +++++++++++++++++++++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +++--- drivers/usb/serial/usb-serial.c | 89 ++- drivers/usb/serial/visor.c | 92 ++-- drivers/usb/serial/whiteheat.c | 110 ++-- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 +++++ drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 12 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +++-- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 5 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 1 + 157 files changed, 4635 insertions(+), 3187 deletions(-) create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/. gregkh-ldp base gregkh-usb ## building file list ... done ./ README add-me4000-pci-data-collection-driver.patch dvb-add-firesat-driver.patch input-add-appleir-driver.patch net-add-alacritech-slicoss-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch series usb-add-sensoray-2255-v4l-driver.patch video-add-the-go7007-driver.patch sent 7494304 bytes received 224 bytes 4996352.00 bytes/sec total size is 7492392 speedup is 1.00 Using base gregkh-usb usb-add-sensoray-2255-v4l-driver.patch dvb-add-firesat-driver.patch video-add-the-go7007-driver.patch net-add-alacritech-slicoss-driver.patch input-add-appleir-driver.patch add-me4000-pci-data-collection-driver.patch ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## BRANCH agp-patches not in tree /pub/scm/linux/kernel/git/airlied/agp-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/misc/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 26 files changed, 1267 insertions(+), 764 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## 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/kernel/process.c Auto-merged arch/powerpc/platforms/powermac/setup.c Merge made by recursive. Documentation/powerpc/phyp-assisted-dump.txt | 127 +++++++ arch/powerpc/Kconfig | 11 + arch/powerpc/configs/maple_defconfig | 131 +++++++- arch/powerpc/kernel/asm-offsets.c | 4 - 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/ppc_ksyms.c | 2 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 59 +++- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - 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/iseries/pci.c | 3 +- arch/powerpc/platforms/maple/pci.c | 47 --- arch/powerpc/platforms/maple/setup.c | 4 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++++++++++++++++ arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + 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/Kbuild | 2 +- 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/phyp_dump.h | 45 +++ 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 ++++---- 62 files changed, 1867 insertions(+), 368 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## ## # merge dvb resolve /home/jejb/dvb-fixup.diff ## Auto-merged drivers/media/common/saa7146_core.c CONFLICT (content): Merge conflict in drivers/media/common/saa7146_core.c Auto-merged drivers/media/common/saa7146_fops.c CONFLICT (content): Merge conflict in drivers/media/common/saa7146_fops.c Auto-merged drivers/media/dvb/dvb-core/dvb_net.c Auto-merged drivers/media/video/adv7170.c Auto-merged drivers/media/video/adv7175.c Auto-merged drivers/media/video/bt819.c Auto-merged drivers/media/video/bt856.c Auto-merged drivers/media/video/dpc7146.c Auto-merged drivers/media/video/mt20xx.c Auto-merged drivers/media/video/mxb.c Auto-merged drivers/media/video/pvrusb2/pvrusb2-ctrl.c Auto-merged drivers/media/video/pvrusb2/pvrusb2-hdw.c Auto-merged drivers/media/video/pwc/pwc-if.c Auto-merged drivers/media/video/saa7110.c Auto-merged drivers/media/video/saa7111.c Auto-merged drivers/media/video/saa7114.c Auto-merged drivers/media/video/saa7185.c Auto-merged drivers/media/video/tda9840.c Auto-merged drivers/media/video/tea6415c.c Auto-merged drivers/media/video/tea6420.c Auto-merged drivers/media/video/tvp5150.c Auto-merged drivers/media/video/zoran_driver.c Auto-merged drivers/media/video/zr364xx.c Created commit 42cfe1c: Resolve Patch: /home/jejb/dvb-fixup.diff ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## 2.6.25-rc7-git5 to af8be4e4b316df36a00c1e52a9970c253783b57e Using base af8be4e4b316df36a00c1e52a9970c253783b57e i2c-new-co-maintainer.patch i2c-ibm_iic-fast-mode-parm-desc-fixup.patch i2c-davinci-01-fix-lost-interrupt.patch i2c-tiny-usb-new-vid-pid-pair.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-bfin-twi-01-add-repeated-start.patch i2c-bfin-twi-02-support-multiport-controllers.patch i2c-bfin-twi-03-add-pin-mux-operation.patch i2c-bfin-twi-04-driver-description.patch i2c-bfin-twi-05-use-simpler-comment-headers.patch i2c-bfin-twi-06-add-ADSP-BF52x-support.patch i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch i2c-scx200_acb-dont-use-0-as-null-pointer.patch ## # merge i2c ## Auto-merged MAINTAINERS Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. MAINTAINERS | 2 + drivers/i2c/algos/Kconfig | 39 +-- drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 63 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-bfin-twi.c | 474 +++++++++++++++++---------- drivers/i2c/busses/i2c-davinci.c | 23 +- drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-tiny-usb.c | 12 +- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/isp1301_omap.c | 28 +- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + 24 files changed, 1790 insertions(+), 590 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 6 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 24 +++- drivers/hid/usbhid/Kconfig | 8 + drivers/hid/usbhid/Makefile | 3 + drivers/hid/usbhid/hid-core.c | 65 +++++---- drivers/hid/usbhid/hid-ff.c | 3 + drivers/hid/usbhid/hid-lg2ff.c | 114 ++++++++++++++++ drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- drivers/hid/usbhid/usbhid.h | 3 +- include/linux/hid.h | 14 ++- 12 files changed, 407 insertions(+), 175 deletions(-) create mode 100644 drivers/hid/usbhid/hid-lg2ff.c ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Merge made by recursive. drivers/input/apm-power.c | 7 ++----- drivers/input/evdev.c | 6 ++---- drivers/input/joydev.c | 3 ++- drivers/input/keyboard/pxa27x_keypad.c | 6 +++--- drivers/input/mousedev.c | 3 ++- include/linux/input.h | 5 +++-- 6 files changed, 14 insertions(+), 16 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 MAINTAINERS Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. Documentation/s390/kvm.txt | 125 ++++++ MAINTAINERS | 10 + arch/s390/Kconfig | 14 + arch/s390/Makefile | 2 +- arch/s390/kernel/early.c | 4 + arch/s390/kernel/setup.c | 14 +- arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Kconfig | 43 ++ arch/s390/kvm/Makefile | 14 + arch/s390/kvm/diag.c | 67 +++ arch/s390/kvm/gaccess.h | 280 +++++++++++++ arch/s390/kvm/intercept.c | 225 ++++++++++ arch/s390/kvm/interrupt.c | 583 ++++++++++++++++++++++++++ arch/s390/kvm/kvm-s390.c | 681 +++++++++++++++++++++++++++++++ arch/s390/kvm/kvm-s390.h | 62 +++ arch/s390/kvm/priv.c | 322 +++++++++++++++ arch/s390/kvm/sie64a.S | 47 +++ arch/s390/kvm/sigp.c | 289 +++++++++++++ arch/s390/lib/uaccess_pt.c | 3 + arch/s390/mm/pgtable.c | 65 +++- arch/x86/Kconfig | 19 + 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 | 633 +++++++++++++++++++++++++---- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 72 ++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 250 +++++++++--- arch/x86/kvm/svm.h | 3 + arch/x86/kvm/tss.h | 59 +++ arch/x86/kvm/vmx.c | 243 +++++++++-- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 813 ++++++++++++++++++++++++++++++++----- arch/x86/kvm/x86_emulate.c | 256 +++++++----- drivers/s390/Makefile | 2 +- drivers/s390/kvm/Makefile | 9 + drivers/s390/kvm/kvm_virtio.c | 332 +++++++++++++++ drivers/s390/sysinfo.c | 100 +----- include/asm-s390/Kbuild | 1 + include/asm-s390/kvm.h | 44 ++ include/asm-s390/kvm_host.h | 234 +++++++++++ include/asm-s390/kvm_para.h | 150 +++++++ include/asm-s390/kvm_virtio.h | 53 +++ include/asm-s390/lowcore.h | 15 +- include/asm-s390/mmu.h | 1 + include/asm-s390/mmu_context.h | 8 +- include/asm-s390/pgtable.h | 93 ++++- include/asm-s390/setup.h | 1 + include/asm-s390/sysinfo.h | 111 +++++ include/asm-x86/kvm.h | 21 + include/asm-x86/kvm_host.h | 70 +++- include/asm-x86/kvm_para.h | 55 +++ include/asm-x86/reboot.h | 2 + include/linux/kvm.h | 59 +++ include/linux/kvm_host.h | 23 +- include/linux/kvm_para.h | 11 +- include/linux/sched.h | 2 + kernel/fork.c | 2 +- mm/rmap.c | 7 +- virt/kvm/kvm_main.c | 91 ++++- 72 files changed, 7268 insertions(+), 618 deletions(-) create mode 100644 Documentation/s390/kvm.txt create mode 100644 arch/s390/kvm/Kconfig create mode 100644 arch/s390/kvm/Makefile create mode 100644 arch/s390/kvm/diag.c create mode 100644 arch/s390/kvm/gaccess.h create mode 100644 arch/s390/kvm/intercept.c create mode 100644 arch/s390/kvm/interrupt.c create mode 100644 arch/s390/kvm/kvm-s390.c create mode 100644 arch/s390/kvm/kvm-s390.h create mode 100644 arch/s390/kvm/priv.c create mode 100644 arch/s390/kvm/sie64a.S create mode 100644 arch/s390/kvm/sigp.c 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 create mode 100644 arch/x86/kvm/tss.h create mode 100644 drivers/s390/kvm/Makefile create mode 100644 drivers/s390/kvm/kvm_virtio.c create mode 100644 include/asm-s390/kvm.h create mode 100644 include/asm-s390/kvm_host.h create mode 100644 include/asm-s390/kvm_para.h create mode 100644 include/asm-s390/kvm_virtio.h create mode 100644 include/asm-s390/sysinfo.h ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Merge made by recursive. drivers/leds/leds-gpio.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## Auto-merged drivers/ata/ahci.c Auto-merged drivers/ata/libata-core.c Auto-merged drivers/ata/libata-eh.c Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/ata/pata_sil680.c Auto-merged drivers/scsi/ipr.c Auto-merged include/linux/libata.h Merge made by recursive. drivers/ata/ahci.c | 177 +++++-------------------- drivers/ata/ata_generic.c | 49 +------- drivers/ata/ata_piix.c | 185 +++----------------------- drivers/ata/libata-core.c | 157 ++++++++++++++++++---- drivers/ata/libata-eh.c | 139 +++++++++----------- drivers/ata/libata-pmp.c | 104 ++++----------- drivers/ata/libata-scsi.c | 7 +- drivers/ata/libata-sff.c | 66 +++++----- drivers/ata/pata_acpi.c | 71 +--------- drivers/ata/pata_ali.c | 161 ++++------------------- drivers/ata/pata_amd.c | 256 ++++++------------------------------ drivers/ata/pata_artop.c | 121 ++--------------- drivers/ata/pata_at32.c | 44 +------ drivers/ata/pata_atiixp.c | 55 +------- drivers/ata/pata_bf54x.c | 33 +---- drivers/ata/pata_cmd640.c | 73 ++++------- drivers/ata/pata_cmd64x.c | 135 ++++--------------- drivers/ata/pata_cs5520.c | 58 +++------ drivers/ata/pata_cs5530.c | 70 ++++------- drivers/ata/pata_cs5535.c | 50 +------- drivers/ata/pata_cs5536.c | 50 +------- drivers/ata/pata_cypress.c | 50 +------- drivers/ata/pata_efar.c | 64 +-------- drivers/ata/pata_hpt366.c | 75 ++++-------- drivers/ata/pata_hpt37x.c | 237 +++++++-------------------------- drivers/ata/pata_hpt3x2n.c | 77 +++--------- drivers/ata/pata_hpt3x3.c | 50 +------- drivers/ata/pata_icside.c | 59 ++------- drivers/ata/pata_isapnp.c | 37 +----- drivers/ata/pata_it8213.c | 65 +-------- drivers/ata/pata_it821x.c | 91 ++++---------- drivers/ata/pata_ixp4xx_cf.c | 40 +----- drivers/ata/pata_jmicron.c | 66 +--------- drivers/ata/pata_legacy.c | 276 +++------------------------------------ drivers/ata/pata_marvell.c | 67 +--------- drivers/ata/pata_mpc52xx.c | 42 +------ drivers/ata/pata_mpiix.c | 55 +------- drivers/ata/pata_netcell.c | 56 ++------- drivers/ata/pata_ninja32.c | 46 +------ drivers/ata/pata_ns87410.c | 60 +-------- drivers/ata/pata_ns87415.c | 94 +++----------- drivers/ata/pata_oldpiix.c | 66 +--------- drivers/ata/pata_opti.c | 64 +--------- drivers/ata/pata_optidma.c | 101 ++------------- drivers/ata/pata_pcmcia.c | 64 +-------- drivers/ata/pata_pdc2027x.c | 89 +------------ drivers/ata/pata_pdc202xx_old.c | 96 +++----------- drivers/ata/pata_platform.c | 44 +------ drivers/ata/pata_qdi.c | 63 +-------- drivers/ata/pata_radisys.c | 51 +------- drivers/ata/pata_rb500_cf.c | 44 +------ drivers/ata/pata_rz1000.c | 49 +------- drivers/ata/pata_sc1200.c | 53 +------- drivers/ata/pata_scc.c | 38 +----- drivers/ata/pata_serverworks.c | 104 +++------------ drivers/ata/pata_sil680.c | 63 ++------- drivers/ata/pata_sis.c | 228 ++++---------------------------- drivers/ata/pata_sl82c105.c | 65 ++-------- drivers/ata/pata_triflex.c | 56 +------- drivers/ata/pata_via.c | 130 ++++--------------- drivers/ata/pata_winbond.c | 41 +----- drivers/ata/pdc_adma.c | 50 ++----- drivers/ata/sata_fsl.c | 39 +----- drivers/ata/sata_inic162x.c | 45 +----- drivers/ata/sata_mv.c | 150 ++++----------------- drivers/ata/sata_nv.c | 213 +++++++----------------------- drivers/ata/sata_promise.c | 98 +++----------- drivers/ata/sata_qstor.c | 46 ++----- drivers/ata/sata_sil.c | 41 +------ drivers/ata/sata_sil24.c | 116 +++++++---------- drivers/ata/sata_sis.c | 38 +----- drivers/ata/sata_svw.c | 33 +----- drivers/ata/sata_sx4.c | 17 +-- drivers/ata/sata_uli.c | 43 +------ drivers/ata/sata_via.c | 112 ++-------------- drivers/ata/sata_vsc.c | 34 +----- drivers/scsi/ipr.c | 3 +- include/linux/libata.h | 249 ++++++++++++++++++++++------------- 78 files changed, 1314 insertions(+), 5190 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## ## # revert 1ad2fb5191fc78f8835130eddc6150eddb9bdcba infiniband ## Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c Auto-merged drivers/infiniband/hw/amso1100/c2_qp.c Auto-merged drivers/infiniband/hw/amso1100/c2_rnic.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/nes/nes_cm.c Auto-merged drivers/infiniband/hw/nes/nes_hw.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c Created commit 4d10410: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__" 26 files changed, 302 insertions(+), 302 deletions(-) ## # merge infiniband resolve /home/jejb/infiniband-fixup.diff ## Auto-merged drivers/infiniband/core/uverbs.h Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/amso1100/c2_provider.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c Auto-merged drivers/infiniband/hw/mlx4/main.c Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Auto-merged include/rdma/ib_verbs.h Created commit c65292c: 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 ## Merge made by recursive. arch/arm/common/it8152.c | 5 +++-- arch/arm/kernel/calls.S | 2 +- arch/arm/kernel/sys_oabi-compat.c | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Merge made by recursive. drivers/firewire/fw-ohci.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Auto-merged drivers/firewire/fw-ohci.c Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/Kconfig | 5 + drivers/firewire/fw-card.c | 50 +---- drivers/firewire/fw-cdev.c | 13 +- drivers/firewire/fw-device.c | 263 ++++++++++++++++++++----- drivers/firewire/fw-device.h | 38 +++- drivers/firewire/fw-ohci.c | 321 ++++++++++++++++++++++++------ drivers/firewire/fw-ohci.h | 1 + drivers/firewire/fw-sbp2.c | 150 +++++++-------- drivers/firewire/fw-topology.c | 22 ++- drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 62 +++--- drivers/firewire/fw-transaction.h | 13 +- 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 | 229 +++++++++++----------- drivers/ieee1394/pcilynx.c | 15 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 24 files changed, 814 insertions(+), 440 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 Auto-merged include/linux/dmaengine.h 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 ## BRANCH upstream not in tree git://www.linux-mips.org/pub/scm/upstream-linus.git, SKIPPING Deleted branch mips. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## BRANCH master not in tree git://www.linux-mips.org/pub/scm/upstream.git, SKIPPING Deleted branch mips-devel. ## # 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/sdhci.c | 88 +++++++++++++++++++++++++++++++-------------- drivers/mmc/host/sdhci.h | 9 +++-- 3 files changed, 87 insertions(+), 49 deletions(-) ## # 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/iwlwifi/iwl-4965-io.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/linux/pcounter.h Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h Auto-merged lib/Makefile Auto-merged lib/kobject_uevent.c Removed lib/pcounter.c 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 Auto-merged net/rxrpc/ar-internal.h Created commit c51d32f: 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 ## Merge made by recursive. arch/s390/kernel/compat_signal.c | 10 ++++++++++ arch/s390/kernel/signal.c | 10 ++++++++++ drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_fba.c | 3 ++- drivers/s390/char/sclp_tty.c | 2 +- drivers/s390/char/sclp_vt220.c | 13 ++++++------- drivers/s390/cio/chsc.c | 12 ++++++++++-- drivers/s390/cio/css.c | 5 +++++ drivers/s390/cio/css.h | 1 + drivers/s390/cio/device_ops.c | 9 ++++++++- drivers/s390/cio/device_status.c | 6 +++++- drivers/s390/cio/qdio.c | 2 +- include/asm-s390/tlbflush.h | 33 +++++++++++++++++++++------------ 14 files changed, 82 insertions(+), 26 deletions(-) ## # gitfetch git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## ## # merge s390 resolve /home/jejb/s390-fixes.diff ## Auto-merged arch/s390/Kconfig Auto-merged arch/s390/defconfig Auto-merged arch/s390/kernel/early.c Auto-merged arch/s390/kernel/setup.c Auto-merged drivers/s390/sysinfo.c Auto-merged fs/Kconfig Auto-merged include/asm-s390/pgtable.h Auto-merged include/asm-s390/setup.h Auto-merged include/asm-s390/sysinfo.h CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h Created commit 0f049ff: Resolve Patch: /home/jejb/s390-fixes.diff ## # 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/aops.c | 6 +- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 96 ++-- 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 +- 41 files changed, 5142 insertions(+), 1038 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/Kconfig | 2 +- security/selinux/avc.c | 13 ++- security/selinux/hooks.c | 135 ++++++++++++++++++-------- 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 | 9 -- security/selinux/include/security.h | 7 +- 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 | 65 +++++++----- security/selinux/ss/policydb.h | 2 + security/selinux/ss/services.c | 61 +++++++++--- 21 files changed, 270 insertions(+), 237 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 | 197 +++++- arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 39 +- arch/sh/boards/renesas/r7780rp/setup.c | 42 +- 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 | 28 +- 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 | 5 +- 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/floppy.h | 6 +- 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 +- 37 files changed, 2465 insertions(+), 181 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 ## 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 | 676 ++++++++++++++++++--------------------- 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 | 22 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 12 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 14 +- fs/xfs/support/ktrace.c | 37 ++- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 41 ++-- fs/xfs/xfs_bmap_btree.c | 38 +++- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 46 ++- 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 | 22 +- fs/xfs/xfs_mount.c | 54 ++-- fs/xfs/xfs_mount.h | 26 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_rtalloc.c | 3 +- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 8 +- fs/xfs/xfs_trans_ail.c | 149 ++++------ fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 51 +--- fs/xfs/xfs_vnodeops.c | 328 +++++-------------- fs/xfs/xfs_vnodeops.h | 14 +- 44 files changed, 1261 insertions(+), 1636 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 ## # skip gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## SKIPPING: skip gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## # skip merge x86 resolve /home/jejb/x86-fixup.diff ## SKIPPING: skip merge x86 resolve /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 +++-- scripts/kernel-doc | 20 ++- 8 files changed, 386 insertions(+), 188 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 ++ drivers/hwmon/w83627ehf.c | 6 +++ drivers/hwmon/w83627hf.c | 5 ++ drivers/hwmon/w83781d.c | 21 +++++++-- drivers/hwmon/w83793.c | 26 ++++++----- drivers/hwmon/w83l785ts.c | 4 +- 26 files changed, 273 insertions(+), 126 deletions(-) ## # git git://git.infradead.org/~dedekind/ubi-2.6.git master ubi ## Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/Kconfig | 9 +- drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/gluebi.c | 5 +- drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 3 +- include/mtd/Kbuild | 1 - 9 files changed, 241 insertions(+), 21 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) ## # git /pub/scm/linux/kernel/git/teigland/dlm.git next dlm ## Merge made by recursive. fs/dlm/config.c | 47 ++++++++++++++++++++++++++++++++++++++--------- fs/dlm/config.h | 3 ++- fs/dlm/dlm_internal.h | 4 +++- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - fs/dlm/member.c | 32 ++++++++++++++++++++++++++++---- fs/dlm/recoverd.c | 1 + 7 files changed, 74 insertions(+), 19 deletions(-) ## # git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git master parisc ## Merge made by recursive. arch/parisc/kernel/signal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus blackfin ## Already up-to-date. ## # quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ m68k ## Using base af8be4e4b316df36a00c1e52a9970c253783b57e m68k-initrd-fix.diff m68k-replace-linux-68k-by-linux-m68k.diff 633-atari_scc.diff POSTPONED/130-adbraw.diff doesn't exist. Skipping. POSTPONED/133-arch.diff doesn't exist. Skipping. POSTPONED/134-atari-fat.diff doesn't exist. Skipping. POSTPONED/141-ide.diff doesn't exist. Skipping. POSTPONED/143-ioext.diff doesn't exist. Skipping. POSTPONED/149-mc68681.diff doesn't exist. Skipping. POSTPONED/152-pci.diff doesn't exist. Skipping. POSTPONED/478-serial.diff doesn't exist. Skipping. atari-rom-isa.diff atari-ethernec.diff atari-aranym.diff atari-ethernat.diff falconide_intr_lock-ratelimit.diff zorro-module-device-table.diff m68k-q40ints.c-needs-asm-floppy.h.diff blinux-list-is-subscribers-only.diff b43-depends-on-HAS_DMA.diff amiga-debug=mem.diff m68k-scsi-HOST_C-cleanup.dif