Checking out files: 11% (293/2581) Checking out files: 12% (310/2581) Checking out files: 13% (336/2581) Checking out files: 14% (362/2581) Checking out files: 15% (388/2581) Checking out files: 16% (413/2581) Checking out files: 17% (439/2581) Checking out files: 18% (465/258Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git master scsi-misc ## Removed drivers/scsi/scsi_debug.h Merge made by recursive. Documentation/scsi/st.txt | 12 +- arch/ia64/hp/sim/simscsi.c | 23 +- drivers/ata/libata-scsi.c | 6 +- drivers/base/transport_class.c | 3 +- drivers/message/fusion/mptbase.c | 29 +- drivers/message/fusion/mptbase.h | 5 +- drivers/message/fusion/mptsas.c | 22 +- drivers/message/fusion/mptscsih.c | 8 +- drivers/s390/scsi/zfcp_aux.c | 33 +- drivers/s390/scsi/zfcp_ccw.c | 21 +- drivers/s390/scsi/zfcp_dbf.c | 1283 ++++++++++++++++++----------- drivers/s390/scsi/zfcp_dbf.h | 229 +++++ drivers/s390/scsi/zfcp_def.h | 169 +---- drivers/s390/scsi/zfcp_erp.c | 680 +++++----------- drivers/s390/scsi/zfcp_ext.h | 57 +- drivers/s390/scsi/zfcp_fsf.c | 410 +++------- drivers/s390/scsi/zfcp_qdio.c | 6 +- drivers/s390/scsi/zfcp_scsi.c | 68 +- drivers/s390/scsi/zfcp_sysfs_adapter.c | 10 +- drivers/s390/scsi/zfcp_sysfs_port.c | 9 +- drivers/s390/scsi/zfcp_sysfs_unit.c | 5 +- drivers/scsi/3w-9xxx.c | 23 +- drivers/scsi/3w-xxxx.c | 14 +- drivers/scsi/BusLogic.c | 5 +- drivers/scsi/BusLogic.h | 21 +- drivers/scsi/FlashPoint.c | 6 +- drivers/scsi/Kconfig | 14 +- drivers/scsi/a2091.c | 3 + drivers/scsi/a3000.c | 3 + drivers/scsi/aacraid/aachba.c | 67 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 2 +- drivers/scsi/aic94xx/aic94xx.h | 16 - drivers/scsi/aic94xx/aic94xx_dev.c | 8 +- drivers/scsi/aic94xx/aic94xx_dump.c | 10 +- drivers/scsi/aic94xx/aic94xx_dump.h | 9 - drivers/scsi/aic94xx/aic94xx_hwi.c | 44 +- drivers/scsi/aic94xx/aic94xx_hwi.h | 2 - drivers/scsi/aic94xx/aic94xx_init.c | 10 +- drivers/scsi/aic94xx/aic94xx_reg.c | 53 +- drivers/scsi/aic94xx/aic94xx_scb.c | 33 +- drivers/scsi/aic94xx/aic94xx_sds.c | 4 +- drivers/scsi/aic94xx/aic94xx_seq.c | 31 +- drivers/scsi/aic94xx/aic94xx_seq.h | 4 - drivers/scsi/aic94xx/aic94xx_task.c | 12 +- drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- drivers/scsi/arm/acornscsi.c | 1 - drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/ch.c | 33 +- drivers/scsi/dc395x.c | 1 - drivers/scsi/eata_pio.c | 2 - drivers/scsi/gdth.c | 320 +++----- drivers/scsi/gdth.h | 2 - drivers/scsi/gvp11.c | 3 + drivers/scsi/hosts.c | 1 - drivers/scsi/hptiop.c | 7 +- drivers/scsi/ips.c | 89 +-- drivers/scsi/libsas/sas_scsi_host.c | 41 + drivers/scsi/lpfc/lpfc.h | 5 +- drivers/scsi/lpfc/lpfc_attr.c | 10 +- drivers/scsi/lpfc/lpfc_ct.c | 48 +- drivers/scsi/lpfc/lpfc_debugfs.c | 2 + drivers/scsi/lpfc/lpfc_els.c | 121 ++-- drivers/scsi/lpfc/lpfc_hbadisc.c | 73 +-- drivers/scsi/lpfc/lpfc_init.c | 98 +-- drivers/scsi/lpfc/lpfc_nportdisc.c | 40 +- drivers/scsi/lpfc/lpfc_scsi.Switched to branch "ide" Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc8-mc18" 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. Switched to branch "2.6.25-rc8-mc18" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" Automatic merge failed; fix conflicts and then commit the result. Checking out files: 21% (66/308) Checking out files: 22% (68/308) Checking out files: 23% (71/308) Checking out files: 24% (74/308) Checking out files: 25% (77/308) Checking out files: 26% (81/308) Checking out files: 27% (84/308) Checking out files: 28% (87/308) Checking out files: 29% (90/308) Checking out files: 30% (93/308) Checking out files: 31% (96/308) Checking out files: 32% (99/308) Checking out files: 33% (102/308) Checking out files: 34% (105/308) Checking out files: 35% (108/308) Checking out files: 36% (111/308) Checking out files: 37% (114/308) Checking out files: 38% (118/308) Checking out files: 39% (121/308) Checking out files: 40% (124/308) Checking out files: 41% (127/308) Checking out files: 42% (130/308) Checking out files: 42% (131/308) Checking out files: 43% (133/308) Checking out files: 44% (136/308) Checking out files: 45% (139/308) Checking out files: 46% (142/308) Checking out files: 47% (145/308) Checking out files: 48% (148/308) Checking out files: 49% (151/308) Checking out files: 50% (154/308) Checking out files: 51% (158/308) Checking out files: 52% (161/308) Checking out files: 53% (164/308) Checking out files: 54% (167/308) Checking out files: 55% (170/308) Checking out files: 56% (173/308) Checking out files: 57% (176/308) Checking out files: 58% (179/308) Checking out files: 59% (182/308) Checking out files: 60% (185/308) Checking out files: 61% (188/308) Checking out files: 62% (191/308) Checking out files: 63% (195/308) Checking out files: 64% (198/308) Checking out files: 65% (201/308) Checking out files: 66% (204/308) Checking out files: 67% (207/308) Checking out files: 68% (210/308) Checking out files: 69% (213/308) Checking out files: 70% (216/308) Checking out files: 71% (219/308) Checking out files: 72% (222/308) Checking out files: 73% (225/308) Checking out files: 74% (228/308) Checking out files: 75% (231/308) Checking out files: 75% (233/308) Checking out files: 76% (235/308) Checking out files: 77% (238/308) Checking out files: 78% (241/308) Checking out files: 79% (244/308) Checking out files: 80% (247/308) Checking out files: 81% (250/308) Checking out files: 82% (253/308) Checking out files: 83% (256/308) Checking out files: 84% (259/308) Checking out files: 85% (262/308) Checking out files: 85% (264/308) Checking out files: 86% (265/308) Checking out files: 87% (268/308) Checking out files: 88% (272/308) Checking out files: 89% (275/308) Checking out files: 90% (278/308) Checking out files: 91% (281/308) Checking out files: 92% (284/308) Checking out files: 93% (287/308) Checking out files: 94% (290/308) Checking out files: 95% (293/308) Checking out files: 96% (296/308) Checking out files: 97% (299/308) Checking out files: 98% (302/308) Checking out files: 99% (305/308) Checking out files: 100% (308/308) Checking out files: 100% (308/308), done. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:19: space before tab in indent. unsigned authenticated:1; warning: 1 line adds whitespace errors. .dotest/patch:14: space before tab in indent. /* .dotest/patch:15: space before tab in indent. * If device is WUSB, we already assigned an .dotest/patch:16: space before tab in indent. * unauthorized address in the Connect Ack sequence; .dotest/patch:17: space before tab in indent. * authorization will assign the final address. .dotest/patch:18: space before tab in indent. */ warning: squelched 2 whitespace errors warning: 7 lines add whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" Switched to branch "gregkh-ldp" .dotest/patch:997: space before tab in indent. return result; .dotest/patch:4833: space before tab in indent. const struct firmware *fw; .dotest/patch:5193: space before tab in indent. const struct firmware *fw; .dotest/patch:7376: space before tab in indent. "Dropping\n", untd_hdr->reserved1); .dotest/patch:8672: space before tab in indent. /* warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. .dotest/patch:58: trailing whitespace. obj-$(CONFIG_SLICOSS) += slicoss.o .dotest/patch:24450: space before tab in indent. ushort DramRomFn; // 14 Dram/Rom function warning: 2 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc18" error: branch 'agp' not found. Switched to branch "i2c" Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" remote: Counting objects: 1  remote: Counting objects: 101, done. remote: Compressing objects: 5% (1/17)  remote: Compressing objects: 11% (2/17)  remote: Compressing objects: 17% (remote: 3/17)  remote: Compressing objects: 23% (4/17)  remote: Compressing objects: 29% (5/17)  remote: Compressing objects: 35% (6/17)  remote: Compressingremote: objects: 41% (7/17)  remote: Compressing objects: 47% (8/17)  remote: Compressing objects: 52% (9/17)  remote: Compressing objects: 58% (10/1remote: 7)  remote: Compressing objects: 64% (11/17)  remote: Compressing objects: 70% (12/17)  remote: Compressing objects: 76% (13/17)  remote: Compressingremote: objects: 82% (14/17)  remote: Compressing objects: 88% (15/17)  remote: Compressing objects: 94% (16/17)  remote: Compressing objects: 100% (1remote: 7/17)  remote: Compressing objects: 100% (17/17), done. remote: Total 75 (delta 58), reused 75 (delta 58) From /pub/scm/linux/kernel/git/axboe/linux-2.6-block 4faa3c8..f003741 for-2.6.26 -> block-for-2.6.26 Already on "2.6.25-rc8-mc18" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/roland/infiniband + eb195d5...e49d217 for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" Automatic merge failed; fix conflicts and then commit the result. www.linux-mips.org[0: 84.159.118.224]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips' not found. www.linux-mips.org[0: 84.159.118.224]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips-devel' not found. warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection remote: Counting objects: 6974, done. remote: Compressing objects: 0% (1/868)  remote: Compressing objects: 1% (9/868)  remote: Compressing objects: 2% (18/868)  remote: Compressing objects: 3% (27/868)  remote: Compressing objects: 4% (35/868)  remote: Compressing objects: 5% (44/868)  remote: Compressing objects: 6% (53/868)  remote: Compressing objects: 7% (61/868)  remote: Compressing objects: 8% (70/868)  remote: Compressing objects: 9% (79/868)  remote: Compressing objects: 10% (87/868)  remote: Compressing objects: 11% (96/868)  remote: Compressing objects: 12% (105/868)  remote: Compressing objects: 13% (113/868)  remote: Compressing objects: 14% (122/868)  remote: Compressing objects: 15% (131/868)  remote: Compressing objects: 16% (139/868)  remote: Compressing objects: 17% (148/868)  remote: Compressing objects: 18% (157/868)  remote: Compressing objects: 19% (165/868)  remote: Compressing objects: 20% (174/868)  remote: Compressing objects: 21% (183/868)  remote: Compressing objects: 22% (191/868)  remote: Compressing objects: 23% (200/868)  remote: Compressing objects: 24% (209/868)  remote: Compressing objects: 25% (217/868)  remote: Compressing objects: 26% (226/868)  remote: Compressing objects: 27% (235/868)  remote: Compressing objects: 28% (244/868)  remote: Compressing objects: 29% (252/868)  remote: Compressing objects: 30% (261/868)  remote: Compressing objects: 31% (270/868)  remote: Compressing objects: 32% (278/868)  remote: Compressing objects: 33% (287/868)  remote: Compressing objects: 34% (296/868)  remote: Compressing objects: 35% (304/868)  remote: Compressing objects: 36% (313/868)  remote: Compressing objects: 37% (322/868)  remote: Compressing objects: 38% (330/868)  remote: Compressing objects: 39% (339/868)  remote: Compressing objects: 40% (348/868)  remote: Compressing objects: 41% (356/868)  remote: Compressing objects: 42% (365/868)  remote: Compressing objects: 43% (374/868)  remote: Compressing objects: 44% (382/868)  remote: Compressing objects: 45% (391/868)  remote: Compressing objects: 46% (400/868)  remote: Compressing objects: 47% (408/868)  remote: Compressing objects: 48% (417/868)  remote: Compressing objects: 49% (426/868)  remote: Compressing objects: 50% (434/868)  remote: Compressing objects: 51% (443/868)  remote: Compressing objects: 52% (452/868)  remote: Compressing objects: 53% (461/868)  remote: Compressing objects: 54% (469/868)  remote: Compressing objects: 55% (478/868)  remote: Compressing objects: 56% (487/868)  remote: Compressing objects: 57% (495/868)  remote: Compressing objects: 58% (504/868)  remote: Compressing objects: 59% (513/868)  remote: Compressing objects: 60% (521/868)  remote: Compressing objects: 61% (530/868)  remote: Compressing objects: 62% (539/868)  remote: Compressing objects: 63% (547/868)  remote: Compressing objects: 64% (556/868)  remote: Compressing objects: 65% (565/868)  remote: Compressing objects: 66% (573/868)  remote: Compressing objects: 67% (582/868)  remote: Compressing objects: 68% (591/868)  remote: Compressing objects: 69% (599/868)  remote: Compressing objects: 70% (608/868)  remote: Compressing objects: 71% (617/868)  remote: Compressing objects: 72% (625/868)  remote: Compressing objects: 73% (634/868)  remote: Compressing objects: 74% (643/868)  remote: Compressing objects: 75% (651/868)  remote: Compressing objects: 76% (660/868)  remote: Compressing objects: 77% (669/868)  remote: Compressing objects: 78% (678/868)  remote: Compressing objects: 79% (686/868)  remote: Compressing objects: 80% (695/868)  remote: Compressing objects: 81% (704/868)  remote: Compressing objects: 82% (712/868)  remote: Compressing objects: 83% (721/868)  remote: Compressing objects: 84% (730/868)  remote: Compressing objects: 85% (738/868)  remote: Compressing objects: 86% (747/868)  remote: Compressing objects: 87% (756/868)  remote: Compressing objects: 88% (764/868)  remote: Compressing objects: 89% (773/868)  remote: Compressing objects: 90% (782/868)  remote: Compressing objects: 91% (790/868)  remote: Compressing objects: 92% (799/868)  remote: Compressing objects: 93% (808/868)  remote: Compressing objects: 94% (816/868)  remote: Compressing objects: 95% (825/868)  remote: Compressing objects: 96% (834/868)  remote: Compressing objects: 97% (842/868)  remote: Compressing objects: 98% (851/868)  remote: Compressing objects: 99% (860/868)  remote: Compressing objects: 100% (868/868)  remote: Compressing objects: 100% (868/868), done. Receiving objects: 0% (1/6372) Receiving objects: 1% (64/6372) Receiving objects: 2% (128/6372) Receiving objects: 3% (192/6372) Receiving objects: 4% (255/6372) Receiving objects: 5% (319/6372) Receiving objects: 6% (383/6372) Receiving objects: 7% (447/6372) Receiving objects: 8% (510/6372) Receiving objects: 9% (574/6372) Receiving objects: 10% (638/6372) Receiving objects: 11% (701/6372) Receiving objects: 12% (765/6372) Receiving objects: 13% (829/6372) Receiving objects: 14% (893/6372) Receiving objects: 15% (956/6372) Receiving objects: 16% (1020/6372) Receiving objects: 17% (1084/6372) Receiving objects: 18% (1147/6372) Receiving objects: 19% (1211/6372) Receiving objects: 20% (1275/6372) Receiving objects: 21% (1339/6372) Receiving objects: 22% (1402/6372) Receiving objects: 23% (1466/6372) Receiving objects: 24% (1530/6372) Receiving objects: 25% (1593/6372) Receiving objects: 26% (1657/6372) Receiving objects: 27% (1721/6372) Receiving objects: 28% (1785/6372) Receiving objects: 29% (1848/6372) Receiving objects: 30% (1912/6372) Receiving objects: 31% (1976/6372) Receiving objects: 32% (2040/6372) Receiving objects: 33% (2103/6372) Receiving objects: 34% (2167/6372) Receiving objects: 35% (2231/6372) Receiving objects: 36% (2294/6372) Receiving objects: 37% (2358/6372) Receiving objects: 38% (2422/6372) Receiving objects: 39% (2486/6372) Receiving objects: 40% (2549/6372) Receiving objects: 41% (2613/6372) Receiving objects: 42% (2677/6372) Receiving objects: 43% (2740/6372) Receiving objects: 44% (2804/6372) Receiving objects: 45% (2868/6372) Receiving objects: 46% (2932/6372) Receiving objects: 47% (2995/6372) Receiving objects: 48% (3059/6372) Receiving objects: 49% (3123/6372) Receiving objects: 50% (3186/6372) Receiving objects: 51% (3250/6372) Receiving objects: 52% (3314/6372) Receiving objects: 53% (3378/6372) Receiving objects: 54% (3441/6372) Receiving objects: 55% (3505/6372) Receiving objects: 56% (3569/6372) Receiving objects: 57% (3633/6372) Receiving objects: 58% (3696/6372) Receiving objects: 59% (3760/6372) Receiving objects: 60% (3824/6372) Receiving objects: 61% (3887/6372) Receiving objects: 62% (3951/6372) Receiving objects: 63% (4015/6372) Receiving objects: 64% (4079/6372) Receiving objects: 65% (4142/6372) Receiving objects: 66% (4206/6372) Receiving objects: 67% (4270/6372) Receiving objects: 68% (4333/6372) Receiving objects: 69% (4397/6372) Receiving objects: 70% (4461/6372) Receiving objects: 71% (4525/6372) Receiving objects: 72% (4588/6372) Receiving objects: 73% (4652/6372) remote: Total 6372 (delta 5494), reused 6372 (delta 5494) Receiving objects: 74% (4716/6372) Receiving objects: 75% (4779/6372) Receiving objects: 76% (4843/6372) Receiving objects: 77% (4907/6372) Receiving objects: 78% (4971/6372) Receiving objects: 79% (5034/6372) Receiving objects: 80% (5098/6372) Receiving objects: 81% (5162/6372) Receiving objects: 82% (5226/6372) Receiving objects: 83% (5289/6372) Receiving objects: 84% (5353/6372) Receiving objects: 85% (5417/6372) Receiving objects: 86% (5480/6372) Receiving objects: 87% (5544/6372) Receiving objects: 88% (5608/6372) Receiving objects: 89% (5672/6372) Receiving objects: 90% (5735/6372) Receiving objects: 91% (5799/6372) Receiving objects: 92% (5863/6372) Receiving objects: 93% (5926/6372) Receiving objects: 94% (5990/6372) Receiving objects: 95% (6054/6372) Receiving objects: 96% (6118/6372) Receiving objects: 97% (6181/6372) Receiving objects: 98% (6245/6372) Receiving objects: 99% (6309/6372) Receiving objects: 100% (6372/6372) Receiving objects: 100% (6372/6372), 995.79 KiB, done. Resolving deltas: 0% (5/5494) Resolving deltas: 1% (55/5494) Resolving deltas: 2% (110/5494) Resolving deltas: 7% (387/5494) Resolving deltas: 9% (544/5494) Resolving deltas: 10% (583/5494) Resolving deltas: 11% (608/5494) Resolving deltas: 12% (664/5494) Resolving deltas: 13% (741/5494) Resolving deltas: 14% (770/5494) Resolving deltas: 16% (920/5494) Resolving deltas: 17% (946/5494) Resolving deltas: 18% (1002/5494) Resolving deltas: 19% (1046/5494) Resolving deltas: 25% (1402/5494) Resolving deltas: 26% (1432/5494) Resolving deltas: 30% (1676/5494) Resolving deltas: 31% (1746/5494) Resolving deltas: 32% (1809/5494) Resolving deltas: 36% (2005/5494) Resolving deltas: 39% (2145/5494) Resolving deltas: 42% (2336/5494) Resolving deltas: 43% (2364/5494) Resolving deltas: 53% (2961/5494) Resolving deltas: 54% (2967/5494) Resolving deltas: 55% (3022/5494) Resolving deltas: 56% (3077/5494) Resolving deltas: 57% (3132/5494) Resolving deltas: 58% (3187/5494) Resolving deltas: 59% (3245/5494) Resolving deltas: 60% (3299/5494) Resolving deltas: 61% (3374/5494) Resolving deltas: 62% (3412/5494) Resolving deltas: 63% (3463/5494) Resolving deltas: 64% (3523/5494) Resolving deltas: 65% (3575/5494) Resolving deltas: 66% (3640/5494) Resolving deltas: 67% (3681/5494) Resolving deltas: 74% (4114/5494) Resolving deltas: 75% (4121/5494) Resolving deltas: 76% (4180/5494) Resolving deltas: 77% (4232/5494) Resolving deltas: 78% (4289/5494) Resolving deltas: 79% (4342/5494) Resolving deltas: 80% (4400/5494) Resolving deltas: 81% (4451/5494) Resolving deltas: 82% (4525/5494) Resolving deltas: 83% (4561/5494) Resolving deltas: 84% (4616/5494) Resolving deltas: 89% (4926/5494) Resolving deltas: 90% (4949/5494) Resolving deltas: 91% (5006/5494) Resolving deltas: 92% (5100/5494) Resolving deltas: 93% (5140/5494) Resolving deltas: 94% (5169/5494) Resolving deltas: 96% (5276/5494) Resolving deltas: 97% (5337/5494) Resolving deltas: 98% (5400/5494) Resolving deltas: 99% (5486/5494) Resolving deltas: 100% (5494/5494) Resolving deltas: 100% (5494/5494), completed with 570 local objects. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + 694071e...e81f0f6 master -> x86 (forced update) Switched to branch "x86" Finished one revert. Checking out files: 3% (109/3229) Checking out files: 4% (130/3229) Checking out files: 5% (162/3229) Checking out files: 6% (194/3229) Checking out files: 7% (227/3229) Checking out files: 8% (259/3229) Checking out files: 9% (291/3229) Checking out files: 10% (323/3229) Checking out files: 11% (356/3229) Checking out files: 12% (388/3229) Checking out files: 13% (420/3229) Checking out files: 14% (453/3229) Checking out files: 14% (462/3229) Checking out files: 15% (485/3229) Checking out files: 16% (517/3229) Checking out files: 17% (549/3229) Checking out files: 17% (569/3229) Checking out files: 18% (582/3229) Checking out files: 19% (614/3229) Checking out files: 20% (646/3229) Checking out files: 21% (679/3229) Checking out files: 22% (711/3229) Checking out files: 23% (743/3229) Checking out files: 24% (775/3229) Checking out files: 25% (808/3229) Checking out files: 26% (840/3229) Checking out files: 27% (872/3229) Checking out files: 28% (905/3229) Checking out files: 29% (937/3229) Checking out files: 30% (969/3229) Checking out files: 31% (1001/3229) Checking out files: 32% (1034/3229) Checking out files: 33% (1066/3229) Checking out files: 34% (1098/3229) Checking out files: 35% (1131/3229) Checking out files: 36% (1163/3229) Checking out files: 37% (1195/3229) Checking out files: 38% (1228/3229) Checking out files: 39% (1260/3229) Checking out files: 40% (1292/3229) Checking out files: 41% (1324/3229) Checking out files: 42% (1357/3229) Checking out files: 43% (1389/3229) Checking out files: 44% (1421/3229) Checking out files: 45% (1454/3229) Checking out files: 46% (1486/3229) Checking out files: 47% (1518/3229) Checking out files: 48% (1550/3229) Checking out files: 49% (1583/3229) Checking out files: 50% (1615/3229) Checking out files: 51% (1647/3229) Checking out files: 52% (1680/3229) Checking out files: 53% (1712/3229) Checking out files: 54% (1744/3229) Checking out files: 55% (1776/3229) Checking out files: 56% (1809/3229) Checking out files: 57% (1841/3229) Checking out files: 58% (1873/3229) Checking out files: 58% (1886/3229) Checking out files: 59% (1906/3229) Checking out files: 60% (1938/3229) Checking out files: 61% (1970/3229) Checking out files: 62% (2002/3229) Checking out files: 63% (2035/3229) Checking out files: 64% (2067/3229) Checking out files: 65% (2099/3229) Checking out files: 66% (2132/3229) Checking out files: 67% (2164/3229) Checking out files: 68% (2196/3229) Checking out files: 69% (2229/3229) Checking out files: 70% (2261/3229) Checking out files: 71% (2293/3229) Checking out files: 72% (2325/3229) Checking out files: 73% (2358/3229) Checking out files: 74% (2390/3229) Checking out files: 75% (2422/3229) Checking out files: 76% (2455/3229) Checking out files: 77% (2487/3229) Checking out files: 78% (2519/3229) Checking out files: 79% (2551/3229) Checking out files: 80% (2584/3229) Checking out files: 81% (2616/3229) Checking out files: 82% (2648/3229) Checking out files: 83% (2681/3229) Checking out files: 83% (2683/3229) Checking out files: 84% (2713/3229) Checking out files: 85% (2745/3229) Checking out files: 86% (2777/3229) Checking out files: 86% (2804/3229) Checking out files: 87% (2810/3229) Checking out files: 88% (2842/3229) Checking out files: 89% (2874/3229) Checking out files: 90% (2907/3229) Checking out files: 91% (2939/3229) Checking out files: 92% (2971/3229) Checking out files: 93% (3003/3229) Checking out files: 94% (3036/3229) Checking out files: 95% (3068/3229) Checking out files: 96% (3100/3229) Checking out files: 97% (3133/3229) Checking out files: 98% (3165/3229) Checking out files: 98% (3166/3229) Checking out files: 99% (3197/3229) Checking out files: 100% (3229/3229) Checking out files: 100% (3229/3229), done. Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. fatal: Not a valid object name: '2.6.25-rc8'. Checking out files: 4% (142/3422) Checking out files: 5% (172/3422) Checking out files: 6% (206/3422) Checking out files: 7% (240/3422) Checking out files: 8% (274/3422) Checking out files: 9% (308/3422) Checking out files: 10% (343/3422) Checking out files: 11% (377/3422) Checking out files: 12% (411/3422) Checking out files: 13% (445/3422) Checking out files: 14% (480/3422) Checking out files: 15% (514/3422) Checking out files: 15% (516/3422) Checking out files: 16% (548/3422) Checking out files: 17% (582/3422) Checking out files: 18% (616/3422) Checking out files: 19% (651/3422) Checking out files: 19% (679/3422) Checking out files: 20% (685/3422) Checking out files: 20% (702/3422) Checking out files: 21% (719/3422) Checking out files: 22% (753/3422) Checking out files: 23% (788/3422) Checking out files: 24% (822/3422) Checking out files: 25% (856/3422) Checking out files: 25% (880/3422) Checking out files: 26% (890/3422) Checking out files: 27% (924/3422) Checking out files: 28% (959/3422) Checking out files: 29% (993/3422) Checking out files: 29% (1000/3422) Checking out files: 30% (1027/3422) Checking out files: 31% (1061/3422) Checking out files: 31% (1066/3422) Checking out files: 32% (1096/3422) Checking out files: 33% (1130/3422) Checking out files: 33% (1139/3422) Checking out files: 34% (1164/3422) Checking out files: 34% (1190/3422) Checking out files: 35% (1198/3422) Checking out files: 36% (1232/3422) Checking out files: 36% (1249/3422) Checking out files: 37% (1267/3422) Checking out files: 38% (1301/3422) Checking out files: 38% (1314/3422) Checking out files: 39% (1335/3422) Checking out files: 40% (1369/3422) Checking out files: 40% (1383/3422) Checking out files: 41% (1404/3422) Checking out files: 42% (1438/3422) Checking out files: 43% (1472/3422) Checking out files: 44% (1506/3422) Checking out files: 44% (1510/3422) Checking out files: 45% (1540/3422) Checking out files: 46% (1575/3422) Checking out files: 47% (1609/3422) Checking out files: 48% (1643/3422) Checking out files: 49% (1677/3422) Checking out files: 50% (1711/3422) Checking out files: 51% (1746/3422) Checking out files: 52% (1780/3422) Checking out files: 53% (1814/3422) Checking out files: 54% (1848/3422) Checking out files: 55% (1883/3422) Checking out files: 56% (1917/3422) Checking out files: 57% (1951/3422) Checking out files: 58% (1985/3422) Checking out files: 59% (2019/3422) Checking out files: 60% (2054/3422) Checking out files: 61% (2088/3422) Checking out files: 61% (2103/3422) Checking out files: 62% (2122/3422) Checking out files: 63% (2156/3422) Checking out files: 64% (2191/3422) Checking out files: 65% (2225/3422) Checking out files: 66% (2259/3422) Checking out files: 67% (2293/3422) Checking out files: 68% (2327/3422) Checking out files: 69% (2362/3422) Checking out files: 70% (2396/3422) Checking out files: 71% (2430/3422) Checking out files: 72% (2464/3422) Checking out files: 72% (2486/3422) Checking out files: 73% (2499/3422) Checking out files: 74% (2533/3422) Checking out files: 75% (2567/3422) Checking out files: 76% (2601/3422) Checking out files: 77% (2635/3422) Checking out files: 78% (2670/3422) Checking out files: 79% (2704/3422) Checking out files: 80% (2738/3422) Checking out files: 81% (2772/3422) Checking out files: 82% (2807/3422) Checking out files: 83% (2841/3422) Checking out files: 84% (2875/3422) Checking out files: 85% (2909/3422) Checking out files: 86% (2943/3422) Checking out files: 87% (2978/3422) Checking out files: 88% (3012/3422) Checking out files: 89% (3046/3422) Checking out files: 90% (3080/3422) Checking out files: 91% (3115/3422) Checking out files: 92% (3149/3422) Checking out files: 93% (3183/3422) Checking out files: 94% (3217/3422) Checking out files: 95% (3251/3422) Checking out files: 96% (3286/3422) Checking out files: 97% (3320/3422) Checking out files: 98% (3354/3422) Checking out files: 99% (3388/3422) Checking out files: 100% (3422/3422) Checking out files: 100% (3422/3422), done. Switched to branch "doc" Checking out files: 17% (606/3432) Checking out files: 18% (618/3432) Checking out files: 19% (653/3432) Checking out files: 20% (687/3432) Checking out files: 21% (721/3432) Checking out files: 22% (756/3432) Checking out files: 23% (790/3432) Checking out files: 24% (824/3432) Checking out files: 25% (858/3432) Checking out files: 26% (893/3432) Checking out files: 27% (927/3432) Checking out files: 28% (961/3432) Checking out files: 29% (996/3432) Checking out files: 30% (1030/3432) Checking out files: 31% (1064/3432) Checking out files: 32% (1099/3432) Checking out files: 33% (1133/3432) Checking out files: 34% (1167/3432) Checking out files: 35% (1202/3432) Checking out files: 36% (1236/3432) Checking out files: 37% (1270/3432) Checking out files: 38% (1305/3432) Checking out files: 39% (1339/3432) Checking out files: 40% (1373/3432) Checking out files: 41% (1408/3432) Checking out files: 42% (1442/3432) Checking out files: 43% (1476/3432) Checking out files: 44% (1511/3432) Checking out files: 45% (1545/3432) Checking out files: 46% (1579/3432) Checking out files: 46% (1607/3432) Checking out files: 47% (1614/3432) Checking out files: 48% (1648/3432) Checking out files: 49% (1682/3432) Checking out files: 50% (1716/3432) Checking out files: 51% (1751/3432) Checking out files: 52% (1785/3432) Checking out files: 53% (1819/3432) Checking out files: 54% (1854/3432) Checking out files: 55% (1888/3432) Checking out files: 55% (1899/3432) Checking out files: 56% (1922/3432) Checking out files: 57% (1957/3432) Checking out files: 58% (1991/3432) Checking out files: 59% (2025/3432) Checking out files: 60% (2060/3432) Checking out files: 61% (2094/3432) Checking out files: 62% (2128/3432) Checking out files: 63% (2163/3432) Checking out files: 64% (2197/3432) Checking out files: 65% (2231/3432) Checking out files: 66% (2266/3432) Checking out files: 67% (2300/3432) Checking out files: 68% (2334/3432) Checking out files: 69% (2369/3432) Checking out files: 70% (2403/3432) Checking out files: 71% (2437/3432) Checking out files: 71% (2444/3432) Checking out files: 71% (2459/3432) Checking out files: 72% (2472/3432) Checking out files: 73% (2506/3432) Checking out files: 74% (2540/3432) Checking out files: 75% (2574/3432) Checking out files: 76% (2609/3432) Checking out files: 77% (2643/3432) Checking out files: 78% (2677/3432) Checking out files: 79% (2712/3432) Checking out files: 80% (2746/3432) Checking out files: 81% (2780/3432) Checking out files: 82% (2815/3432) Checking out files: 83% (2849/3432) Checking out files: 84% (2883/3432) Checking out files: 85% (2918/3432) Checking out files: 86% (2952/3432) Checking out files: 87% (2986/3432) Checking out files: 88% (3021/3432) Checking out files: 89% (3055/3432) Checking out files: 90% (3089/3432) Checking out files: 91% (3124/3432) Checking out files: 92% (3158/3432) Checking out files: 93% (3192/3432) Checking out files: 94% (3227/3432) Checking out files: 95% (3261/3432) Checking out files: 96% (3295/3432) Checking out files: 97% (3330/3432) Checking out files: 98% (3364/3432) Checking out files: 98% (3386/3432) Checking out files: 98% (3392/3432) Checking out files: 99% (3398/3432) Checking out files: 100% (3432/3432) Checking out files: 100% (3432/3432), done. Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection Checking out files: 41% (1397/3372) Checking out files: 42% (1417/3372) Checking out files: 43% (1450/3372) Checking out files: 44% (1484/3372) Checking out files: 45% (1518/3372) Checking out files: 46% (1552/3372) Checking out files: 47% (1585/3372) Checking out files: 48% (1619/3372) Checking out files: 49% (1653/3372) Checking out files: 50% (1686/3372) Checking out files: 51% (1720/3372) Checking out files: 52% (1754/3372) Checking out files: 53% (1788/3372) Checking out files: 54% (1821/3372) Checking out files: 55% (1855/3372) Checking out files: 56% (1889/3372) Checking out files: 57% (1923/3372) Checking out files: 58% (1956/3372) Checking out files: 59% (1990/3372) Checking out files: 60% (2024/3372) Checking out files: 61% (2057/3372) Checking out files: 62% (2091/3372) Checking out files: 63% (2125/3372) Checking out files: 64% (2159/3372) Checking out files: 65% (2192/3372) Checking out files: 66% (2226/3372) Checking out files: 67% (2260/3372) Checking out files: 68% (2293/3372) Checking out files: 69% (2327/3372) Checking out files: 70% (2361/3372) Checking out files: 71% (2395/3372) Checking out files: 72% (2428/3372) Checking out files: 73% (2462/3372) Checking out files: 74% (2496/3372) Checking out files: 75% (2529/3372) Checking out files: 76% (2563/3372) Checking out files: 77% (2597/3372) Checking out files: 78% (2631/3372) Checking out files: 79% (2664/3372) Checking out files: 79% (2688/3372) Checking out files: 80% (2698/3372) Checking out files: 81% (2732/3372) Checking out files: 82% (2766/3372) Checking out files: 83% (2799/3372) Checking out files: 84% (2833/3372) Checking out files: 85% (2867/3372) Checking out files: 86% (2900/3372) Checking out files: 87% (2934/3372) Checking out files: 88% (2968/3372) Checking out files: 89% (3002/3372) Checking out files: 90% (3035/3372) Checking out files: 91% (3069/3372) Checking out files: 92% (3103/3372) Checking out files: 93% (3136/3372) Checking out files: 94% (3170/3372) Checking out files: 95% (3204/3372) Checking out files: 96% (3238/3372) Checking out files: 97% (3271/3372) Checking out files: 98% (3305/3372) Checking out files: 99% (3339/3372) Checking out files: 100% (3372/3372) Checking out files: 100% (3372/3372), done. Switched to branch "m68k" .dotest/patch:353: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:382: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:404: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use .dotest/patch:426: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use warning: 4 lines add whitespace errors. .dotest/patch:868: space before tab in indent. break; .dotest/patch:870: space before tab in indent. } while (--poll_count); .dotest/patch:875: space before tab in indent. if (!poll_count) { .dotest/patch:880: space before tab in indent. } else { .dotest/patch:1631: space before tab in indent. shouldn't this be a given if we have it here ? */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Checking out files: 43% (1495/3442) Checking out files: 44% (1515/3442) Checking out files: 45% (1549/3442) Checking out files: 46% (1584/3442) Checking out files: 47% (1618/3442) Checking out files: 48% (1653/3442) Checking out files: 49% (1687/3442) Checking out files: 50% (1721/3442) Checking out files: 51% (1756/3442) Checking out files: 52% (1790/3442) Checking out files: 53% (1825/3442) Checking out files: 54% (1859/3442) Checking out files: 55% (1894/3442) Checking out files: 56% (1928/3442) Checking out files: 57% (1962/3442) Checking out files: 58% (1997/3442) Checking out files: 59% (2031/3442) Checking out files: 60% (2066/3442) Checking out files: 61% (2100/3442) Checking out files: 62% (2135/3442) Checking out files: 63% (2169/3442) Checking out files: 64% (2203/3442) Checking out files: 65% (2238/3442) Checking out files: 66% (2272/3442) Checking out files: 67% (2307/3442) Checking out files: 68% (2341/3442) Checking out files: 69% (2375/3442) Checking out files: 70% (2410/3442) Checking out files: 71% (2444/3442) Checking out files: 72% (2479/3442) Checking out files: 72% (2494/3442) Checking out files: 73% (2513/3442) Checking out files: 74% (2548/3442) Checking out files: 75% (2582/3442) Checking out files: 76% (2616/3442) Checking out files: 77% (2651/3442) Checking out files: 78% (2685/3442) Checking out files: 79% (2720/3442) Checking out files: 80% (2754/3442) Checking out files: 81% (2789/3442) Checking out files: 82% (2823/3442) Checking out files: 83% (2857/3442) Checking out files: 84% (2892/3442) Checking out files: 85% (2926/3442) Checking out files: 86% (2961/3442) Checking out files: 87% (2995/3442) Checking out files: 88% (3029/3442) Checking out files: 89% (3064/3442) Checking out files: 90% (3098/3442) Checking out files: 91% (3133/3442) Checking out files: 92% (3167/3442) Checking out files: 93% (3202/3442) Checking out files: 94% (3236/3442) Checking out files: 95% (3270/3442) Checking out files: 96% (3305/3442) Checking out files: 97% (3339/3442) Checking out files: 98% (3374/3442) Checking out files: 99% (3408/3442) Checking out files: 100% (3442/3442) Checking out files: 100% (3442/3442), done. Switched to branch "2.6.25-rc8-mc18" Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection remote: Counting objects: 392, done. remote: Compressing objects: 2% (1/40)  remote: Compressing objects: 5% (2/40)  remote: Compressing objects: 7% (remote: 3/40)  remote: Compressing objects: 10% (4/40)  remote: Compressing objects: 12% (5/40)  remote: Compressing objects: 15% (6/40)  remote: Compressingremote: objects: 17% (7/40)  remote: Compressing objects: 20% (8/40)  remote: Compressing objects: 22% (9/40)  remote: Compressing objects: 25% (10/4remote: 0)  remote: Compressing objects: 27% (11/40)  remote: Compressing objects: 30% (12/40)  remote: Compressing objects: 32% (13/40)  remote: Compressingremote: objects: 35% (14/40)  remote: Compressing objects: 37% (15/40)  remote: Compressing objects: 40% (16/40)  remote: Compressing objects: 42% (1remote: 7/40)  remote: Compressing objects: 45% (18/40)  remote: Compressing objects: 47% (19/40)  remote: Compressing objects: 50% (20/40)  remote: Compressremote: ing objects: 52% (21/40)  remote: Compressing objects: 55% (22/40)  remote: Compressing objects: 57% (23/40)  remote: Compressing objects: 60%remote: (24/40)  remote: Compressing objects: 62% (25/40)  remote: Compressing objects: 65% (26/40)  remote: Compressing objects: 67% (27/40)  remote: ComprReceiving objects: 0% (1/312) Receiving objects: 1% (4/312) Receiving objects: 2% (7/312) Receiving objects: 3% (10/312) Receiving objects: 4% (13/312) Receiving objects: 5% (16/312) Receiving objects: 6% (19/312) Receiving objects: 7% (22/312) Receiving objects: 8% (25/312) Receiving objects: 9% (29/312) Receiving objects: 10% (32/312) Receiving objects: 11% (35/312) Receiving objects: 12% (38/312) Receiving objects: 13% (41/312) Receiving objects: 14% (44/312) Receiving objects: 15% (47/312) Receiving objects: 16% (50/312) Receiving objects: 17% (54/312) Receiving objects: 18% (57/312) Receiving objects: 19% (60/312) Receiving objects: 20% (63/312) Receiving objects: 21% (66/312) Receiving objects: 22% (69/312) Receiving objects: 23% (72/312) Receiving objects: 24% (75/312) Receiving objects: 25% (78/312) Receiving objects: 26% (82/312) Receiving objects: 27% (85/312) Receiving objects: 28% (88/312) Receiving objects: 29% (91/312) Receiving objects: 30% (94/312) Receiving objects: 31% (97/312) Receiving objects: 32% (100/312) remote: essing objects: 70% (28/40)  remote: Compressing objects: 72% (29/40)  remote: Compressing objects: 75% (30/40)  remote: Compressing objects:  remote: 77% (31/40)  remote: Compressing objects: 80% (32/40)  remote: Compressing objects: 82% (33/40)  remote: Compressing objects: 85% (34/40)  remote: Coremote: mpressing objects: 87% (35/40)  remote: Compressing objects: 90% (36/40)  remote: Compressing objects: 92% (37/40)  remote: Compressing objectsremote: : 95% (38/40)  remote: Compressing objects: 97% (39/40)  remote: Compressing objects: 100% (40/40)  remote: Compressing objects: 100% (40/40), dremote: one. remote: Total 312 (delta 272), reused 311 (delta 271) Receiving objects: 33% (103/312) Receiving objects: 34% (107/312) Receiving objects: 35% (110/312) Receiving objects: 36% (113/312) Receiving objects: 37% (116/312) Receiving objects: 38% (119/312) Receiving objects: 39% (122/312) Receiving objects: 40% (125/312) Receiving objects: 41% (128/312) Receiving objects: 42% (132/312) Receiving objects: 43% (135/312) Receiving objects: 44% (138/312) Receiving objects: 45% (141/312) Receiving objects: 46% (144/312) Receiving objects: 47% (147/312) Receiving objects: 48% (150/312) Receiving objects: 49% (153/312) Receiving objects: 50% (156/312) Receiving objects: 51% (160/312) Receiving objects: 52% (163/312) Receiving objects: 53% (166/312) Receiving objects: 54% (169/312) Receiving objects: 55% (172/312) Receiving objects: 56% (175/312) Receiving objects: 57% (178/312) Receiving objects: 58% (181/312) Receiving objects: 59% (185/312) Receiving objects: 60% (188/312) Receiving objects: 61% (191/312) Receiving objects: 62% (194/312) Receiving objects: 63% (197/312) Receiving objects: 64% (200/312) Receiving objects: 65% (203/312) Receiving objects: 66% (206/312) Receiving objects: 67% (210/312) Receiving objects: 68% (213/312) Receiving objects: 69% (216/312) Receiving objects: 70% (219/312) Receiving objects: 71% (222/312) Receiving objects: 72% (225/312) Receiving objects: 73% (228/312) Receiving objects: 74% (231/312) Receiving objects: 75% (234/312) Receiving objects: 76% (238/312) Receiving objects: 77% (241/312) Receiving objects: 78% (244/312) Receiving objects: 79% (247/312) Receiving objects: 80% (250/312) Receiving objects: 81% (253/312) Receiving objects: 82% (256/312) Receiving objects: 83% (259/312) Receiving objects: 84% (263/312) Receiving objects: 85% (266/312) Receiving objects: 86% (269/312) Receiving objects: 87% (272/312) Receiving objects: 88% (275/312) Receiving objects: 89% (278/312) Receiving objects: 90% (281/312) Receiving objects: 91% (284/312) Receiving objects: 92% (288/312) Receiving objects: 93% (291/312) Receiving objects: 94% (294/312) Receiving objects: 95% (297/312) Receiving objects: 96% (300/312) Receiving objects: 97% (303/312) Receiving objects: 98% (306/312) Receiving objects: 99% (309/312) Receiving objects: 100% (312/312) Receiving objects: 100% (312/312), 84.47 KiB, done. Resolving deltas: 1% (4/272) Resolving deltas: 2% (6/272) Resolving deltas: 4% (13/272) Resolving deltas: 20% (56/272) Resolving deltas: 21% (58/272) Resolving deltas: 22% (60/272) Resolving deltas: 38% (105/272) Resolving deltas: 39% (108/272) Resolving deltas: 40% (109/272) Resolving deltas: 41% (113/272) Resolving deltas: 42% (115/272) Resolving deltas: 43% (119/272) Resolving deltas: 44% (120/272) Resolving deltas: 45% (123/272) Resolving deltas: 46% (126/272) Resolving deltas: 49% (135/272) Resolving deltas: 54% (147/272) Resolving deltas: 55% (150/272) Resolving deltas: 57% (157/272) Resolving deltas: 58% (158/272) Resolving deltas: 59% (163/272) Resolving deltas: 60% (164/272) Resolving deltas: 63% (172/272) Resolving deltas: 64% (176/272) Resolving deltas: 65% (178/272) Resolving deltas: 66% (180/272) Resolving deltas: 67% (183/272) Resolving deltas: 68% (187/272) Resolving deltas: 69% (188/272) Resolving deltas: 70% (192/272) Resolving deltas: 71% (194/272) Resolving deltas: 72% (198/272) Resolving deltas: 73% (201/272) Resolving deltas: 74% (203/272) Resolving deltas: 75% (204/272) Resolving deltas: 81% (223/272) Resolving deltas: 88% (241/272) Resolving deltas: 90% (245/272) Resolving deltas: 91% (248/272) Resolving deltas: 92% (252/272) Resolving deltas: 93% (254/272) Resolving deltas: 94% (256/272) Resolving deltas: 95% (259/272) Resolving deltas: 96% (262/272) Resolving deltas: 97% (264/272) Resolving deltas: 98% (267/272) Resolving deltas: 99% (270/272) Resolving deltas: 100% (272/272) Resolving deltas: 100% (272/272), completed with 78 local objects. From /pub/scm/linux/kernel/git/viro/vfs-2.6 + a0d8078...af13045 vfs-2.6.25 -> vfs (forced update) Already on "2.6.25-rc8-mc18" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection | 78 ++-- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 ++-- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 ++++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 21 +- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 ++++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 +++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 ++- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 112 files changed, 2717 insertions(+), 2159 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # merge gregkh-driver ## Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/ch.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/lpfc/lpfc_attr.c Auto-merged drivers/scsi/qla2xxx/qla_attr.c Auto-merged drivers/scsi/qla2xxx/qla_gbl.h Auto-merged drivers/scsi/raid_class.c Auto-merged drivers/scsi/st.c Auto-merged include/linux/attribute_container.h Auto-merged include/linux/transport_class.h Auto-merged include/scsi/scsi_host.h Merge made by recursive. Documentation/ABI/testing/sysfs-ibft | 23 + Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + arch/x86/kernel/setup_32.c | 3 + arch/x86/kernel/setup_64.c | 4 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 +- drivers/base/bus.c | 17 +- drivers/base/class.c | 8 +- drivers/base/core.c | 30 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 66 +- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/firmware/Kconfig | 20 + drivers/firmware/Makefile | 2 + drivers/firmware/iscsi_ibft.c | 982 ++++++++++++++++++++ drivers/firmware/iscsi_ibft_find.c | 84 ++ drivers/infiniband/core/sysfs.c | 76 +- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 +- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 ++-- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 ++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 ++-- drivers/scsi/lpfc/lpfc_attr.c | 484 +++++----- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 13 +- drivers/scsi/ncr53c8xx.c | 7 +- drivers/scsi/osst.c | 76 +- drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- drivers/scsi/qla2xxx/qla_attr.c | 177 ++-- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/raid_class.c | 73 +- drivers/scsi/scsi_sas_internal.h | 24 +- drivers/scsi/scsi_sysfs.c | 150 ++-- drivers/scsi/scsi_transport_fc.c | 385 +++++---- drivers/scsi/scsi_transport_iscsi.c | 107 ++- drivers/scsi/scsi_transport_sas.c | 157 ++-- drivers/scsi/scsi_transport_spi.c | 185 ++-- drivers/scsi/scsi_transport_srp.c | 26 +- drivers/scsi/sd.c | 78 +- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 +- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 21 +- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/iscsi_ibft.h | 50 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +- include/linux/pm_wakeup.h | 90 ++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 +- 120 files changed, 3885 insertions(+), 2159 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-ibft create mode 100644 drivers/firmware/iscsi_ibft.c create mode 100644 drivers/firmware/iscsi_ibft_find.c create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/iscsi_ibft.h create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-generic-pci_enable_resources.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-add-pci-express-aspm-support.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-clean-up-resource-alignment-management.patch pci-clean-up-search.c-a-lot.patch pci-cris-use-generic-pci_enable_resources.patch pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-expose-pci-vpd-through-sysfs.patch pci-frv-use-generic-pci_enable_resources.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-ia64-use-generic-pci_enable_resources.patch pci-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-iommu-iotlb-flushing.patch pci-iova-rb-tree-setup-tweak.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-update-via-cx700-quirk.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch series sent 449395 bytes received 1038 bytes 900866.00 bytes/sec total size is 444040 speedup is 0.99 Using base gregkh-driver pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch pci-update-via-cx700-quirk.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-clean-up-resource-alignment-management.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit e3bb409: 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 bitmap-add-bitmap_copy_le.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-usb-serial-spcp8x5-driver.patch usb-add-usb_dev_reset_delayed.patch usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-ftdi_sio-note-missing-locking.patch usb-g_printer-bugfixes.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-increase-cdc-acm-write-throughput.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-serial-remove-obsolete-contact-addresses.patch usb-serial-sierra-c597-fix.patch usb-serial-sierra-clean-up.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-usb.h-reduce-syslog-clutter.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-use-div_round_up.patch usbmon-restore-mmap.patch wusb-add-authenticated-bit-to-usb-dev.patch wusb-add-link-wusb-usb-dev.patch wusb-add-the-uwb-include-files.patch wusb-add-usb-specific-wusb-include-files.patch wusb-devices-dont-use-a-set-address.patch wusb-documentation.patch wusb-make-ep0-reinit-available.patch wusb-teach-choose-address-about-wireless-devices.patch wusb-update-devnum.patch sent 1301402 bytes received 2006 bytes 868938.67 bytes/sec total size is 1290620 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-add-usb_dt_cs_radio_control-define-to-ch9.h.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 usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-serial-sierra-clean-up.patch usb-serial-sierra-c597-fix.patch usb-add-usb-serial-spcp8x5-driver.patch u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-serial-remove-obsolete-contact-addresses.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-g_printer-bugfixes.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch wusb-add-authenticated-bit-to-usb-dev.patch usb-add-usb_dev_reset_delayed.patch wusb-add-link-wusb-usb-dev.patch wusb-teach-choose-address-about-wireless-devices.patch wusb-devices-dont-use-a-set-address.patch wusb-make-ep0-reinit-available.patch wusb-update-devnum.patch wusb-documentation.patch bitmap-add-bitmap_copy_le.patch wusb-add-usb-specific-wusb-include-files.patch wusb-add-the-uwb-include-files.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/WUSB-Design-overview.txt | 448 +++ Documentation/usb/persist.txt | 43 +- Documentation/usb/usb-serial.txt | 7 +- Documentation/usb/wusb-cbaf | 136 + drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.c | 2 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 469 ++- drivers/usb/core/hub.h | 9 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/amd5536udc.c | 10 + drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 28 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 92 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 10 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 5139 ++++++++++++------------- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 20 +- drivers/usb/misc/adutux.c | 120 +- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 +- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 +- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 +- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++-- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 +- drivers/usb/serial/garmin_gps.c | 112 +- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 +- drivers/usb/serial/io_ti.c | 392 +- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 +- drivers/usb/serial/keyspan.c | 262 +- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 +- drivers/usb/serial/mos7840.c | 159 +- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 +- drivers/usb/serial/pl2303.c | 112 +- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 83 +- drivers/usb/serial/spcp8x5.c | 1075 ++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +- drivers/usb/serial/usb-serial.c | 89 +- drivers/usb/serial/visor.c | 92 +- drivers/usb/serial/whiteheat.c | 110 +- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 + drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 26 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/bitmap.h | 1 + include/linux/usb.h | 188 +- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 17 +- 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/wusb-wa.h | 284 ++ include/linux/usb/wusb.h | 420 ++ include/linux/usb_usual.h | 1 + include/linux/uwb.h | 770 ++++ include/linux/uwb/bugs-macros.h | 64 + include/linux/uwb/bugs.h | 41 + include/linux/uwb/debug-cmd.h | 57 + include/linux/uwb/debug.h | 82 + include/linux/uwb/spec.h | 650 ++++ include/linux/uwb/umc.h | 194 + include/linux/uwb/util.h | 87 + include/linux/uwb/whci.h | 117 + include/linux/wlp.h | 728 ++++ lib/bitmap.c | 20 + 175 files changed, 11509 insertions(+), 5825 deletions(-) create mode 100644 Documentation/usb/WUSB-Design-overview.txt create mode 100644 Documentation/usb/wusb-cbaf 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 create mode 100644 include/linux/usb/wusb-wa.h create mode 100644 include/linux/usb/wusb.h create mode 100644 include/linux/uwb.h create mode 100644 include/linux/uwb/bugs-macros.h create mode 100644 include/linux/uwb/bugs.h create mode 100644 include/linux/uwb/debug-cmd.h create mode 100644 include/linux/uwb/debug.h create mode 100644 include/linux/uwb/spec.h create mode 100644 include/linux/uwb/umc.h create mode 100644 include/linux/uwb/util.h create mode 100644 include/linux/uwb/whci.h create mode 100644 include/linux/wlp.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/. gregkh-ldp base gregkh-usb ## building file list ... done ./ 7363.patch 7364.patch 7365.patch 7366.patch 7367.patch 7368.patch 7369.patch 7370.patch 7371.patch 7372.patch 7373.patch 7374.patch 7375.patch 7376.patch 7377.patch README add-me4000-pci-data-collection-driver.patch aectc-add-the-aectc-driver.patch dvb-add-firesat-driver.patch input-add-appleir-driver.patch net-add-alacritech-slicoss-driver.patch net-add-et131x-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 wusb-add-hwa-hc-wireless-host-controller-driver.patch wusb-add-the-usb-wireless-core-code.patch wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch wusb-add-the-usb-wusb-cbaf-driver.patch wusb-add-the-wireless-usb-stack-to-linux.patch sent 9007528 bytes received 708 bytes 3603294.40 bytes/sec total size is 9003468 speedup is 1.00 Using base gregkh-usb wusb-add-the-wireless-usb-stack-to-linux.patch wusb-add-the-usb-wireless-core-code.patch wusb-add-the-usb-wusb-cbaf-driver.patch wusb-add-the-usb-wireless-core-host-controller-helper-driver.patch wusb-add-hwa-hc-wireless-host-controller-driver.patch usb-add-sensoray-2255-v4l-driver.patch dvb-add-firesat-driver.patch 7363.patch 7364.patch 7365.patch 7366.patch 7367.patch 7368.patch 7369.patch 7370.patch 7371.patch 7372.patch 7373.patch 7374.patch 7375.patch 7376.patch 7377.patch video-add-the-go7007-driver.patch net-add-alacritech-slicoss-driver.patch input-add-appleir-driver.patch add-me4000-pci-data-collection-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch aectc-add-the-aectc-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(-) ## # 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/usb/gadget/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 | 302 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/Kconfig | 4 +- drivers/usb/gadget/atmel_usba_udc.c | 156 ++++++++--------- drivers/usb/gadget/atmel_usba_udc.h | 9 + 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 +++ 28 files changed, 1305 insertions(+), 766 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/CHANGES | 3 ++- fs/cifs/cifsacl.c | 14 ++++++++------ fs/cifs/cifsacl.h | 1 + fs/cifs/cifssmb.c | 32 ++++++++++++++++++-------------- 4 files changed, 29 insertions(+), 21 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/powerpc/kernel/process.c Auto-merged arch/powerpc/kernel/rtas_flash.c Auto-merged arch/powerpc/kernel/setup_32.c Auto-merged arch/powerpc/oprofile/cell/vma_map.c Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c Auto-merged arch/powerpc/sysdev/cpm2.c Auto-merged arch/ppc/platforms/radstone_ppc7d.c Merge made by recursive. Documentation/kernel-parameters.txt | 2 + Documentation/powerpc/booting-without-of.txt | 16 - Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ arch/powerpc/Kconfig | 37 +- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/Makefile | 38 +- arch/powerpc/boot/bamboo.c | 3 +- arch/powerpc/boot/cuboot-rainier.c | 3 +- arch/powerpc/boot/cuboot-sequoia.c | 3 +- arch/powerpc/boot/cuboot-taishan.c | 3 +- arch/powerpc/boot/cuboot-warp.c | 2 +- arch/powerpc/boot/cuboot-yosemite.c | 44 + arch/powerpc/boot/dts/bamboo.dts | 2 - arch/powerpc/boot/dts/canyonlands.dts | 402 +++++++++ arch/powerpc/boot/dts/ebony.dts | 2 - arch/powerpc/boot/dts/glacier.dts | 467 +++++++++++ arch/powerpc/boot/dts/haleakala.dts | 4 +- arch/powerpc/boot/dts/katmai.dts | 2 +- arch/powerpc/boot/dts/kilauea.dts | 4 +- arch/powerpc/boot/dts/ksi8560.dts | 267 ++++++ arch/powerpc/boot/dts/makalu.dts | 4 +- arch/powerpc/boot/dts/rainier.dts | 6 +- arch/powerpc/boot/dts/sequoia.dts | 6 +- arch/powerpc/boot/dts/taishan.dts | 31 +- arch/powerpc/boot/dts/walnut.dts | 1 - arch/powerpc/boot/dts/warp.dts | 1 - arch/powerpc/boot/dts/yosemite.dts | 304 +++++++ arch/powerpc/boot/ebony.c | 3 +- arch/powerpc/boot/libfdt-wrapper.c | 2 +- arch/powerpc/boot/ps3-head.S | 25 +- arch/powerpc/boot/ps3.c | 23 +- arch/powerpc/boot/simpleboot.c | 84 ++ arch/powerpc/boot/treeboot-walnut.c | 2 +- arch/powerpc/boot/virtex405-head.S | 30 + arch/powerpc/boot/wrapper | 27 +- arch/powerpc/configs/canyonlands_defconfig | 721 +++++++++++++++++ arch/powerpc/configs/chrp32_defconfig | 7 +- arch/powerpc/configs/g5_defconfig | 7 +- arch/powerpc/configs/iseries_defconfig | 7 +- arch/powerpc/configs/ksi8560_defconfig | 899 +++++++++++++++++++++ arch/powerpc/configs/maple_defconfig | 131 +++- arch/powerpc/configs/pmac32_defconfig | 7 +- arch/powerpc/configs/ppc44x_defconfig | 14 +- arch/powerpc/configs/ppc64_defconfig | 8 +- arch/powerpc/configs/pseries_defconfig | 8 +- arch/powerpc/kernel/asm-offsets.c | 4 - arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/cpu_setup_44x.S | 5 +- arch/powerpc/kernel/cputable.c | 28 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 - arch/powerpc/kernel/ibmebus.c | 12 +- arch/powerpc/kernel/iommu.c | 4 +- arch/powerpc/kernel/isa-bridge.c | 6 +- arch/powerpc/kernel/lparcfg.c | 12 +- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/ppc_ksyms.c | 3 +- arch/powerpc/kernel/process.c | 5 - arch/powerpc/kernel/prom.c | 61 ++- arch/powerpc/kernel/rtas.c | 4 +- arch/powerpc/kernel/rtas_flash.c | 2 +- arch/powerpc/kernel/rtas_pci.c | 29 +- arch/powerpc/kernel/setup-common.c | 11 +- arch/powerpc/kernel/setup_32.c | 12 + arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/sys_ppc32.c | 5 - arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/kernel/vio.c | 10 +- arch/powerpc/lib/string.S | 14 + arch/powerpc/math-emu/fabs.c | 2 +- arch/powerpc/math-emu/fadd.c | 2 +- arch/powerpc/math-emu/fadds.c | 2 +- arch/powerpc/math-emu/fcmpo.c | 2 +- arch/powerpc/math-emu/fcmpu.c | 2 +- arch/powerpc/math-emu/fctiw.c | 2 +- arch/powerpc/math-emu/fctiwz.c | 2 +- arch/powerpc/math-emu/fdiv.c | 6 +- arch/powerpc/math-emu/fdivs.c | 6 +- arch/powerpc/math-emu/fmadd.c | 2 +- arch/powerpc/math-emu/fmadds.c | 2 +- arch/powerpc/math-emu/fmr.c | 2 +- arch/powerpc/math-emu/fmsub.c | 2 +- arch/powerpc/math-emu/fmsubs.c | 2 +- arch/powerpc/math-emu/fmul.c | 2 +- arch/powerpc/math-emu/fmuls.c | 2 +- arch/powerpc/math-emu/fnabs.c | 2 +- arch/powerpc/math-emu/fneg.c | 2 +- arch/powerpc/math-emu/fnmadd.c | 2 +- arch/powerpc/math-emu/fnmadds.c | 2 +- arch/powerpc/math-emu/fnmsub.c | 2 +- arch/powerpc/math-emu/fnmsubs.c | 2 +- arch/powerpc/math-emu/fres.c | 2 +- arch/powerpc/math-emu/frsp.c | 2 +- arch/powerpc/math-emu/frsqrte.c | 2 +- arch/powerpc/math-emu/fsel.c | 2 +- arch/powerpc/math-emu/fsqrt.c | 2 +- arch/powerpc/math-emu/fsqrts.c | 2 +- arch/powerpc/math-emu/fsub.c | 2 +- arch/powerpc/math-emu/fsubs.c | 2 +- arch/powerpc/math-emu/lfd.c | 2 +- arch/powerpc/math-emu/lfs.c | 2 +- arch/powerpc/math-emu/mcrfs.c | 4 +- arch/powerpc/math-emu/mffs.c | 2 +- arch/powerpc/math-emu/mtfsb0.c | 2 +- arch/powerpc/math-emu/mtfsb1.c | 2 +- arch/powerpc/math-emu/mtfsf.c | 2 +- arch/powerpc/math-emu/mtfsfi.c | 2 +- arch/powerpc/math-emu/stfd.c | 2 +- arch/powerpc/math-emu/stfiwx.c | 2 +- arch/powerpc/math-emu/stfs.c | 2 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 32 +- arch/powerpc/mm/init_32.c | 4 +- arch/powerpc/mm/init_64.c | 4 +- arch/powerpc/mm/mem.c | 5 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/oprofile/cell/spu_task_sync.c | 12 +- arch/powerpc/oprofile/cell/vma_map.c | 10 +- arch/powerpc/oprofile/op_model_cell.c | 14 +- arch/powerpc/platforms/40x/ep405.c | 2 + arch/powerpc/platforms/40x/kilauea.c | 4 +- arch/powerpc/platforms/40x/makalu.c | 2 + arch/powerpc/platforms/40x/virtex.c | 2 + arch/powerpc/platforms/40x/walnut.c | 4 +- arch/powerpc/platforms/44x/44x.h | 1 - arch/powerpc/platforms/44x/Kconfig | 27 + arch/powerpc/platforms/44x/Makefile | 2 + arch/powerpc/platforms/44x/bamboo.c | 15 +- arch/powerpc/platforms/44x/canyonlands.c | 63 ++ arch/powerpc/platforms/44x/ebony.c | 5 +- arch/powerpc/platforms/44x/katmai.c | 5 +- arch/powerpc/platforms/44x/misc_44x.S | 11 - arch/powerpc/platforms/44x/rainier.c | 4 +- arch/powerpc/platforms/44x/sequoia.c | 4 +- arch/powerpc/platforms/44x/taishan.c | 5 +- arch/powerpc/platforms/44x/warp-nand.c | 3 +- arch/powerpc/platforms/44x/warp.c | 6 +- arch/powerpc/platforms/52xx/lite5200.c | 4 +- arch/powerpc/platforms/85xx/Kconfig | 7 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ksi8560.c | 257 ++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/Kconfig.cputype | 2 + arch/powerpc/platforms/cell/iommu.c | 10 +- arch/powerpc/platforms/cell/pervasive.c | 2 +- arch/powerpc/platforms/cell/ras.c | 10 +- arch/powerpc/platforms/cell/spu_base.c | 8 +- arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- arch/powerpc/platforms/cell/spu_manage.c | 8 +- arch/powerpc/platforms/cell/spufs/file.c | 4 +- arch/powerpc/platforms/cell/spufs/run.c | 10 +- arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 10 +- arch/powerpc/platforms/iseries/pci.c | 3 +- arch/powerpc/platforms/maple/pci.c | 47 -- arch/powerpc/platforms/maple/setup.c | 4 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/device-init.c | 78 ++- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/ps3/setup.c | 14 +- arch/powerpc/platforms/ps3/spu.c | 7 + arch/powerpc/platforms/pseries/Makefile | 1 + arch/powerpc/platforms/pseries/eeh.c | 5 +- arch/powerpc/platforms/pseries/lpar.c | 15 + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/powerpc/platforms/pseries/phyp_dump.c | 498 ++++++++++++ arch/powerpc/platforms/pseries/reconfig.c | 12 +- arch/powerpc/platforms/pseries/scanlog.c | 37 +- arch/powerpc/platforms/pseries/setup.c | 4 + arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 +- arch/powerpc/sysdev/ppc4xx_pci.c | 133 +++- arch/powerpc/sysdev/ppc4xx_pci.h | 59 ++ arch/powerpc/sysdev/ppc4xx_soc.c | 200 +++++ arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +- arch/powerpc/sysdev/qe_lib/ucc_fast.c | 32 +- arch/powerpc/sysdev/qe_lib/ucc_slow.c | 18 +- arch/powerpc/sysdev/tsi108_dev.c | 4 +- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/8xx_io/fec.c | 4 +- arch/ppc/kernel/head.S | 17 - arch/ppc/mm/init.c | 1 - arch/ppc/platforms/radstone_ppc7d.c | 8 +- arch/ppc/syslib/mpc52xx_setup.c | 2 +- arch/sparc64/Kconfig | 1 + drivers/block/viodasd.c | 2 +- drivers/char/xilinx_hwicap/buffer_icap.c | 22 +- drivers/char/xilinx_hwicap/buffer_icap.h | 5 +- drivers/char/xilinx_hwicap/fifo_icap.c | 31 +- drivers/char/xilinx_hwicap/fifo_icap.h | 1 + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 63 +- drivers/char/xilinx_hwicap/xilinx_hwicap.h | 24 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 ++++++-- drivers/net/pasemi_mac.h | 35 +- drivers/net/pasemi_mac_ethtool.c | 159 ++++ drivers/net/ps3_gelic_net.c | 81 ++ drivers/net/ps3_gelic_net.h | 20 + drivers/of/base.c | 26 + drivers/ps3/ps3-sys-manager.c | 74 ++- drivers/ps3/sys-manager-core.c | 16 +- drivers/serial/of_serial.c | 4 +- include/asm-powerpc/Kbuild | 2 +- include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/dcr-native.h | 17 + include/asm-powerpc/dcr-regs.h | 78 ++ include/asm-powerpc/lmb.h | 82 +-- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 ++- include/asm-powerpc/pgtable-ppc32.h | 3 +- include/asm-powerpc/phyp_dump.h | 45 + include/asm-powerpc/ppc4xx.h | 18 + include/asm-powerpc/ps3.h | 7 +- include/asm-powerpc/sparsemem.h | 1 + include/asm-powerpc/string.h | 2 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 ++ include/linux/of.h | 1 + lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++-- 233 files changed, 6757 insertions(+), 864 deletions(-) create mode 100644 Documentation/powerpc/phyp-assisted-dump.txt create mode 100644 arch/powerpc/boot/cuboot-yosemite.c create mode 100644 arch/powerpc/boot/dts/canyonlands.dts create mode 100644 arch/powerpc/boot/dts/glacier.dts create mode 100644 arch/powerpc/boot/dts/ksi8560.dts create mode 100644 arch/powerpc/boot/dts/yosemite.dts create mode 100644 arch/powerpc/boot/simpleboot.c create mode 100644 arch/powerpc/boot/virtex405-head.S create mode 100644 arch/powerpc/configs/canyonlands_defconfig create mode 100644 arch/powerpc/configs/ksi8560_defconfig create mode 100644 arch/powerpc/platforms/44x/canyonlands.c create mode 100644 arch/powerpc/platforms/85xx/ksi8560.c create mode 100644 arch/powerpc/platforms/pseries/phyp_dump.c create mode 100644 arch/powerpc/sysdev/ppc4xx_soc.c create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-powerpc/phyp_dump.h create mode 100644 include/asm-powerpc/ppc4xx.h create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 9 + Documentation/video4linux/CARDLIST.saa7134 | 9 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 2 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 96 ++- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/Kconfig | 1 + drivers/media/dvb/b2c2/Makefile | 1 + drivers/media/dvb/b2c2/flexcop-common.h | 17 +- drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 113 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 180 ++- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- drivers/media/dvb/b2c2/flexcop.c | 10 +- drivers/media/dvb/bt8xx/Kconfig | 2 +- drivers/media/dvb/bt8xx/Makefile | 5 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 14 +- drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- drivers/media/dvb/dvb-core/demux.h | 2 + drivers/media/dvb/dvb-core/dmxdev.c | 10 +- drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 1 + drivers/media/dvb/dvb-usb/cxusb.c | 13 +- drivers/media/dvb/dvb-usb/dib0700.h | 4 + drivers/media/dvb/dvb-usb/dib0700_core.c | 4 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++++- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- drivers/media/dvb/dvb-usb/ttusb2.c | 62 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 304 +++-- drivers/media/dvb/frontends/cx24123.h | 21 +- drivers/media/dvb/frontends/dvb-pll.c | 260 +--- drivers/media/dvb/frontends/dvb-pll.h | 31 +- drivers/media/dvb/frontends/isl6405.c | 164 ++ drivers/media/dvb/frontends/isl6405.h | 74 + drivers/media/dvb/frontends/lgdt330x.c | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 2 +- drivers/media/dvb/frontends/s5h1420.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 12 +- drivers/media/dvb/frontends/tda1004x.h | 1 - drivers/media/dvb/frontends/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 57 +- drivers/media/dvb/frontends/tda18271-fe.c | 418 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 16 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 23 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 167 +- drivers/media/dvb/frontends/tda827x.h | 4 +- drivers/media/dvb/frontends/ves1x93.c | 2 +- drivers/media/dvb/frontends/xc5000.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- drivers/media/radio/dsbr100.c | 2 + drivers/media/radio/miropcm20-radio.c | 2 + drivers/media/radio/miropcm20-rds.c | 2 +- drivers/media/radio/radio-aimslab.c | 2 + drivers/media/radio/radio-aztech.c | 2 + drivers/media/radio/radio-cadet.c | 12 +- drivers/media/radio/radio-gemtek-pci.c | 2 + drivers/media/radio/radio-gemtek.c | 2 + drivers/media/radio/radio-maestro.c | 2 + drivers/media/radio/radio-maxiradio.c | 2 + drivers/media/radio/radio-rtrack2.c | 2 + drivers/media/radio/radio-sf16fmi.c | 2 + drivers/media/radio/radio-sf16fmr2.c | 104 +- drivers/media/radio/radio-si470x.c | 59 +- drivers/media/radio/radio-terratec.c | 2 + drivers/media/radio/radio-trust.c | 2 + drivers/media/radio/radio-typhoon.c | 4 +- drivers/media/radio/radio-zoltrix.c | 2 + drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 9 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 6 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 33 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 3 + drivers/media/video/bt8xx/bttvp.h | 1 - drivers/media/video/bw-qcam.c | 6 +- drivers/media/video/c-qcam.c | 6 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia.c | 2 + drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cpia2/cpia2_v4l.c | 2 + drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 15 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-core.c | 91 +- drivers/media/video/cx25840/cx25840-core.h | 2 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx25840/cx25840-vbi.c | 6 +- drivers/media/video/cx88/Kconfig | 1 + drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 10 +- drivers/media/video/cx88/cx88-cards.c | 581 ++++++- drivers/media/video/cx88/cx88-core.c | 13 +- drivers/media/video/cx88/cx88-dvb.c | 245 +++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 15 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 63 +- drivers/media/video/cx88/cx88.h | 14 +- drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 4 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 26 +- drivers/media/video/ivtv/ivtv-cards.c | 7 +- drivers/media/video/ivtv/ivtv-cards.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 44 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-queue.c | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 14 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 7 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 844 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/ov511.c | 2 + drivers/media/video/pms.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 52 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- drivers/media/video/pwc/pwc-if.c | 10 +- drivers/media/video/pxa_camera.c | 1000 +++++++++++ drivers/media/video/saa5249.c | 2 + drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 4 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/Kconfig | 1 + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 427 +++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 22 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 6 +- drivers/media/video/sn9c102/sn9c102_core.c | 12 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +- drivers/media/video/soc_camera.c | 1033 ++++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 6 +- drivers/media/video/stv680.c | 11 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 861 ++++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 57 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 8 +- drivers/media/video/usbvideo/vicam.c | 2 + drivers/media/video/usbvision/usbvision-core.c | 45 +- drivers/media/video/usbvision/usbvision-i2c.c | 8 +- drivers/media/video/usbvision/usbvision-video.c | 46 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 168 ++- drivers/media/video/videobuf-dma-sg.c | 137 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 49 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vivi.c | 334 ++--- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 6 +- drivers/media/video/w9968cf.c | 4 +- drivers/media/video/zc0301/zc0301_core.c | 4 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_card.h | 2 + drivers/media/video/zoran_device.c | 12 +- drivers/media/video/zoran_driver.c | 4 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 55 +- include/media/ir-common.h | 2 + include/media/soc_camera.h | 179 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 9 +- include/media/videobuf-dma-sg.h | 14 +- 255 files changed, 11100 insertions(+), 3609 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## 2.6.25-rc8-git9 to d10d89ec78114f925f63c5126a2b2490f501a462 Using base d10d89ec78114f925f63c5126a2b2490f501a462 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-new-co-maintainer.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-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 i2c-superh-mobile-i2c-bus-controller-v5.patch i2c-fix-platform-driver-hotplug-coldplug.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 | 73 +++-- drivers/i2c/busses/Makefile | 3 + drivers/i2c/busses/i2c-at91.c | 2 +- drivers/i2c/busses/i2c-au1550.c | 1 + drivers/i2c/busses/i2c-bfin-twi.c | 475 +++++++++++++++++---------- drivers/i2c/busses/i2c-davinci.c | 26 +- drivers/i2c/busses/i2c-gpio.c | 1 + drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- drivers/i2c/busses/i2c-iop3xx.c | 1 + drivers/i2c/busses/i2c-ixp2000.c | 1 + drivers/i2c/busses/i2c-mpc.c | 3 + drivers/i2c/busses/i2c-ocores.c | 3 + drivers/i2c/busses/i2c-omap.c | 1 + drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 7 +- drivers/i2c/busses/i2c-pnx.c | 45 ++-- drivers/i2c/busses/i2c-powermac.c | 3 + drivers/i2c/busses/i2c-pxa.c | 3 +- drivers/i2c/busses/i2c-s3c2410.c | 5 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-sh_mobile.c | 500 ++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-simtec.c | 3 + drivers/i2c/busses/i2c-tiny-usb.c | 12 +- drivers/i2c/busses/i2c-versatile.c |