Checking out files: 18% (77/426) Checking out files: 19% (81/426) Checking out files: 20% (86/426) Checking out files: 21% (90/426) Checking out files: 22% (94/426) Checking out files: 23% (98/426) Checking out files: 24% (103/426) Checking out files: 25% (107/426) Checking Removing patches/ ## # git /pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git master scsi-rc-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/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.c | 34 +- drivers/scsi/lpfc/lpfc_sli.c | 112 ++- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 3 +- drivers/scsi/mac_scsi.c | 1 - drivers/scsi/megaraid/megaraid_sas.c | 49 +- drivers/scsi/megaraid/megaraid_sas.h | 5 + drivers/scsi/mvme147.c | 3 + drivers/scsi/ps3rom.c | 101 +-- drivers/scsi/qla2xxx/Kconfig | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 36 +- drivers/scsi/qla2xxx/qla_dbg.c | 124 +--- drivers/scsi/qla2xxx/qla_dbg.h | 23 +- drivers/scsi/qla2xxx/qla_def.h | 78 ++- drivers/scsi/qla2xxx/qla_dfs.c | 2 +- drivers/scsi/qla2xxx/qla_fw.h | 173 ++++- drivers/scsi/qla2xxx/qla_gbl.h | 33 +- drivers/scsi/qla2xxx/qla_gs.c | 16 +- drivers/scsi/qla2xxx/qla_init.c | 192 +++-- drivers/scsi/qla2xxx/qla_inline.h | 87 +-- drivers/scsi/qla2xxx/qla_iocb.c | 5 +- drivers/scsi/qla2xxx/qla_isr.c | 223 +++--- drivers/scsi/qla2xxx/qla_mbx.c | 318 ++++++-- drivers/scsi/qla2xxx/qla_mid.c | 30 +- drivers/scsi/qla2xxx/qla_os.c | 443 +++++----- drivers/scsi/qla2xxx/qla_settings.h | 16 +- drivers/scChecking out files: 12% (17/141) Checking out files: 13% (19/141) Checking out files: 14% (20/141) Checking out files: 15% (22/141) Checking out files: 16% (23/141) Checking out files: 17% (24/141) Checking out files: 18% (26/141) Checking out files: 19% (27/141) Checking out files: 20% (29/141) Checking out files: 21% (30/141) Checking out files: 22% (32/141) Checking out files: 23% (33/141) Checking out files: 24% (34/141) Checking out files: 25% (36/141) Checking out files: 26% (37/141) Checking out files: 27% (39/141) Checking out files: 28% (40/141) Checking out files: 29% (41/141) Checking out files: 30% (43/141) Checking out files: 31% (44/141) Checking out files: 32% (46/141) Checking out files: 33% (47/141) Checking out files: 34% (48/141) Checking out files: 35% (50/141) Checking out files: 36% (51/141) Checking out files: 37% (53/141) Checking out files: 38% (54/141) Checking out files: 39% (55/141) Checking out files: 40% (57/141) Checking out files: 41% (58/141) Checking out files: 42% (60/141) Checking out files: 43% (61/141) Checking out files: 44% (63/141) Checking out files: 45% (64/141) Checking out files: 46% (65/141) Checking out files: 47% (67/141) Checking out files: 48% (68/141) Checking out files: 49% (70/141) Checking out files: 50% (71/141) Checking out files: 51% (72/141) Checking out files: 52% (74/141) Checking out files: 53% (75/141) Checking out files: 54% (77/141) Checking out files: 55% (78/141) Checking out files: 56% (79/141) Checking out files: 57% (81/141) Checking out files: 58% (82/141) Checking out files: 59% (84/141) Checking out files: 60% (85/141) Checking out files: 61% (87/141) Checking out files: 62% (88/141) Checking out files: 63% (89/141) Checking out files: 64% (91/141) Checking out files: 65% (92/141) Checking out files: 66% (94/141) Checking out files: 67% (95/141) Checking out files: 68% (96/141) Checking out files: 69% (98/141) Checking out files: 70% (99/141) Checking out files: 71% (101/141) Checking out files: 72% (102/141) Checking out files: 73% (103/141) Checking out files: 74% (105/141) Checking out files: 75% (106/141) Checking out files: 76% (108/141) Checking out files: 77% (109/141) Checking out files: 78% (110/141) Checking out files: 79% (112/141) Checking out files: 80% (113/141) Checking out files: 81% (115/141) Checking out files: 82% (116/141) Checking out files: 83% (118/141) Checking out files: 84% (119/141) Checking out files: 85% (120/141) Checking out files: 86% (122/141) Checking out files: 87% (123/141) Checking out files: 88% (125/141) Checking out files: 89% (126/141) Checking out files: 90% (127/141) Checking out files: 91% (129/141) Checking out files: 92% (130/141) Checking out files: 93% (132/141) Checking out files: 94% (133/141) Checking out files: 95% (134/141) Checking out files: 96% (136/141) Checking out files: 97% (137/141) Checking out files: 98% (139/141) Checking out files: 99% (140/141) Checking out files: 100% (141/141) Checking out files: 100% (141/141), done. Switched to branch "ide" Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc8-mc16" 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-mc16" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch: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-mc16" Already on "2.6.25-rc8-mc16" Switched to branch "gregkh-ldp" .dotest/patch:1373: space before tab in indent. int result; .dotest/patch:1851: space before tab in indent. int result; .dotest/patch:6858: space before tab in indent. UWB_PHY_RATE_53 : UWB_PHY_RATE_200, .dotest/patch:7459: space before tab in indent. struct device *dev = &xfer->wa->usb_iface->dev; .dotest/patch:7475: space before tab in indent. break; warning: squelched 13 whitespace errors warning: 18 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. Checking out files: 10% (45/426) Checking out files: 11% (47/426) Checking out files: 12% (52/426) Checking out files: 13% (56/426) Checking out files: 14% (60/426) Checking out files: 15% (64/426) Checking out files: 16% (69/426) Checking out files: 17% (73/426) Checking out files: 18% (77/426) Checking out files: 19% (81/426) Checking out files: 20% (86/426) Checking out files: 21% (90/426) Checking out files: 22% (94/426) Checking out files: 23% (98/426) Checking out files: 24% (103/426) Checking out files: 25% (107/426) Checking out files: 26% (111/426) Checking out files: 27% (116/426) Checking out files: 28% (120/426) Checking out files: 29% (124/426) Checking out files: 30% (128/426) Checking out files: 31% (133/426) Checking out files: 32% (137/426) Checking out files: 33% (141/426) Checking out files: 34% (145/426) Checking out files: 35% (150/426) Checking out files: 36% (154/426) Checking out files: 37% (158/426) Checking out files: 38% (162/426) Checking out files: 39% (167/426) Checking out files: 40% (171/426) Checking out files: 41% (175/426) Checking out files: 42% (179/426) Checking out files: 43% (184/426) Checking out files: 44% (188/426) Checking out files: 45% (192/426) Checking out files: 46% (196/426) Checking out files: 47% (201/426) Checking out files: 48% (205/426) Checking out files: 49% (209/426) Checking out files: 50% (213/426) Checking out files: 51% (218/426) Checking out files: 52% (222/426) Checking out files: 53% (226/426) Checking out files: 54% (231/426) Checking out files: 55% (235/426) Checking out files: 56% (239/426) Checking out files: 57% (243/426) Checking out files: 58% (248/426) Checking out files: 59% (252/426) Checking out files: 60% (256/426) Checking out files: 61% (260/426) Checking out files: 62% (265/426) Checking out files: 63% (269/426) Checking out files: 64% (273/426) Checking out files: 65% (277/426) Checking out files: 66% (282/426) Checking out files: 67% (286/426) Checking out files: 68% (290/426) Checking out files: 69% (294/426) Checking out files: 70% (299/426) Checking out files: 71% (303/426) Checking out files: 72% (307/426) Checking out files: 73% (311/426) Checking out files: 74% (316/426) Checking out files: 75% (320/426) Checking out files: 76% (324/426) Checking out files: 77% (329/426) Checking out files: 78% (333/426) Checking out files: 79% (337/426) Checking out files: 80% (341/426) Checking out files: 81% (346/426) Checking out files: 82% (350/426) Checking out files: 83% (354/426) Checking out files: 84% (358/426) Checking out files: 85% (363/426) Checking out files: 86% (367/426) Checking out files: 87% (371/426) Checking out files: 88% (375/426) Checking out files: 89% (380/426) Checking out files: 90% (384/426) Checking out files: 91% (388/426) Checking out files: 92% (392/426) Checking out files: 93% (397/426) Checking out files: 94% (401/426) Checking out files: 95% (405/426) Checking out files: 96% (409/426) Checking out files: 97% (414/426) Checking out files: 98% (418/426) Checking out files: 99% (422/426) Checking out files: 100% (426/426) Checking out files: 100% (426/426), done. Switched to branch "2.6.25-rc8-mc16" error: branch 'agp' not found. remote: Counting objects: 1  remote: Counting objects: 17, done. remote: Compressing objects: 9% (1/11)  remote: Compressing objects: 18% (2/11)  remote: Compressing objects: 27% (3/11)  remote: Compressing objects: 36% (4/11)  remote: Compressing objects: 45% (5/11)  remote: Compressing objects: 54% (6/11)  remote: Compressing objects:remote: 63% (7/11)  remote: Compressing objects: 72% (8/11)  remote: Compressing objects: 81% (9/11)  remote: Compressing objects: 90% (10/11)  remote: Comremote: pressing objects: 100% (11/11)  remote: Compressing objects: 100% (11/11), done. remote: Total 11 (delta 9), reused 0 (delta 0) From /pub/scm/linux/kernel/git/sfrench/cifs-2.6 932e2d2..cce246e master -> cifs Switched to branch "i2c" Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" remote: Counting objects: 1  remote: Counting objects: 13, done. remote: Compressing objects: 25% (1/4)  remote: Compressing objects: 50% (2/4)  remote: Compresremote: sing objects: 75% (3/4)  remote: Compressing objects: 100% (4/4)  remote: Compressing objects: 100% (4/4), done. remote: Total 8 (delta 6), reused remote: 6 (delta 4) From /pub/scm/linux/kernel/git/axboe/linux-2.6-block 34e6bbf..4faa3c8 for-linus -> block-for-linus From /pub/scm/linux/kernel/git/axboe/linux-2.6-block 34e6bbf..4faa3c8 for-linus -> block-for-2.6.26 remote: Counting objects: 1041, done. remote: Compressing objects: 0% (1/157)  remote: Compressing objects: 1% (2/157)  remote: Compressing objects: 2% (4/157)  remote: Compressing objects: 3% (5/157)  remote: Compressing objects: 4% (7/157)  remote: Compressing objecremote: ts: 5% (8/157)  remote: Compressing objects: 6% (10/157)  remote: Compressing objects: 7% (11/157)  remote: Compressing objects: 8% (13/15remote: 7)  remote: Compressing objects: 9% (15/157)  remote: Compressing objects: 10% (16/157)  remote: Compressing objects: 11% (18/157)  remote: Compressremote: ing objects: 12% (19/157)  remote: Compressing objects: 13% (21/157)  remote: Compressing objects: 14% (22/157)  remote: Compressing objects: 15% (24/157)  remote: Compressing objects: 16% (26/157)  remote: Compressing objects: 17% (27/157)  remote: Compressing obremote: jects: 18% (29/157)  remote: Compressing objects: 19% (30/157)  remote: Compressing objects: 20% (32/157)  remote: Compressing objects: 21% (3remote: 3/157)  remote: Compressing objects: 22% (35/157)  remote: Compressing objects: 23% (37/157)  remote: Compressing objects: 24% (38/157)  remote: Compressing obremote: jects: 25% (40/157)  remote: Compressing objects: 26% (41/157)  remote: Compressing objects: 27% (43/157)  remote: Compressing objects: 28% (4remote: 4/157)  remote: Compressing objects: 29% (46/157)  remote: Compressing objects: 30% (48/157)  remote: Compressing objects: 31% (49/157)  remote: Compremote: ressing objects: 32% (51/157)  remote: Compressing objects: 33% (52/157)  remote: Compressing objects: 34% (54/157)  remote: Compressing objectremote: s: 35% (55/157)  remote: Compressing objects: 36% (57/157)  remote: Compressing objects: 37% (59/157)  remote: Compressing objects: 38% (60/157)  remote: Compressing objects: 39% (62/157)  remote: Compressing obremote: jects: 40% (63/157)  remote: Compressing objects: 41% (65/157)  remote: Compressing objects: 42% (66/157)  remote: Compressing objects: 43% (6remote: 8/157)  remote: Compressing objects: 44% (70/157)  remote: Compressing objects: 45% (71/157)  remote: Compressing objects: 46% (73/157)  remote: Compremote: ressing objects: 47% (74/157)  remote: Compressing objects: 48% (76/157)  remote: Compressing objects: 49% (77/157)  remote: Compressing objects: 50% (79/157)  remote: Compressing objects: 51% (81/157)  remote: Compressing objects: 52% (82/157)  remote: Compressing obremote: jects: 53% (84/157)  remote: Compressing objects: 54% (85/157)  remote: Compressing objects: 55% (87/157)  remote: Compressing objects: 56% (8remote: 8/157)  remote: Compressing objects: 57% (90/157)  remote: Compressing objects: 58% (92/157)  remote: Compressing objects: 59% (93/157)  remote: Compremote: ressing objects: 60% (95/157)  remote: Compressing objects: 61% (96/157)  remote: Compressing objects: 62% (98/157)  remote: Compressing objectremote: s: 63% (99/157)  remote: Compressing objects: 64% (101/157)  remote: Compressing objects: 65% (103/157)  remote: Compressing objects: 66% (104remote: /157)  remote: Compressing objects: 67% (106/157)  remote: Compressing objects: 68% (107/157)  remote: Compressing objects: 69% (109/157)  remote: Coremote: mpressing objects: 70% (110/157)  remote: Compressing objects: 71% (112/157)  remote: Compressing objects: 72% (114/157)  remote: Compressing oremote: bjects: 73% (115/157)  remote: Compressing objects: 74% (117/157)  remote: Compressing objects: 75% (118/157)  remote: Compressing objects: 76remote: % (120/157)  remote: Compressing objects: 77% (121/157)  remote: Compressing objects: 78% (123/157)  remote: Compressing objects: 79% (125/157)remote:  remote: Compressing objects: 80% (126/157)  remote: Compressing objects: 81% (128/157)  remote: Compressing objects: 82% (129/157)  remote: Compresremote: sing objects: 83% (131/157)  remote: Compressing objects: 84% (132/157)  remote: Compressing objects: 85% (134/157)  remote: Compressing objectremote: s: 86% (136/157)  remote: Compressing objects: 87% (137/157)  remote: Compressing objects: 88% (139/157)  remote: Compressing objects: 89% (14remote: 0/157)  remote: Compressing objects: 90% (142/157)  remote: Compressing objects: 91% (143/157)  remote: Compressing objects: 92% (145/157)  remote: Cremote: ompressing objects: 93% (147/157)  remote: Compressing objects: 94% (148/157)  remote: Compressing objects: 95% (150/157)  remote: Compressing remote: objects: 96% (151/157)  remote: Compressing objects: 97% (153/157)  remote: Compressing objects: 98% (154/157)  remote: Compressing objects: 9remote: 9% (156/157)  remote: Compressing objects: 100% (157/157)  remote: Compressing objects: 100% (157/157), done. Receiving objects: 0% (1/951) Receiving objects: 1% (10/951) Receiving objects: 2% (20/951) Receiving objects: 3% (29/951) Receiving objects: 4% (39/951) Receiving objects: 5% (48/951) Receiving objects: 6% (58/951) Receiving objects: 7% (67/951) Receiving objects: 8% (77/951) Receiving objects: 9% (86/951) Receiving objects: 10% (96/951) Receiving objects: 11% (105/951) remote: Total 951 (delta 880), reused 864 (delta 794) Receiving objects: 12% (115/951) Receiving objects: 13% (124/951) Receiving objects: 14% (134/951) Receiving objects: 15% (143/951) Receiving objects: 16% (153/951) Receiving objects: 17% (162/951) Receiving objects: 18% (172/951) Receiving objects: 19% (181/951) Receiving objects: 20% (191/951) Receiving objects: 21% (200/951) Receiving objects: 22% (210/951) Receiving objects: 23% (219/951) Receiving objects: 24% (229/951) Receiving objects: 25% (238/951) Receiving objects: 26% (248/951) Receiving objects: 27% (257/951) Receiving objects: 28% (267/951) Receiving objects: 29% (276/951) Receiving objects: 30% (286/951) Receiving objects: 31% (295/951) Receiving objects: 32% (305/951) Receiving objects: 33% (314/951) Receiving objects: 34% (324/951) Receiving objects: 35% (333/951) Receiving objects: 36% (343/951) Receiving objects: 37% (352/951) Receiving objects: 38% (362/951) Receiving objects: 39% (371/951) Receiving objects: 40% (381/951) Receiving objects: 41% (390/951) Receiving objects: 42% (400/951) Receiving objects: 43% (409/951) Receiving objects: 44% (419/951) Receiving objects: 45% (428/951) Receiving objects: 46% (438/951) Receiving objects: 47% (447/951) Receiving objects: 48% (457/951) Receiving objects: 49% (466/951) Receiving objects: 50% (476/951) Receiving objects: 51% (486/951) Receiving objects: 52% (495/951) Receiving objects: 53% (505/951) Receiving objects: 54% (514/951) Receiving objects: 55% (524/951) Receiving objects: 56% (533/951) Receiving objects: 57% (543/951) Receiving objects: 58% (552/951) Receiving objects: 59% (562/951) Receiving objects: 60% (571/951) Receiving objects: 61% (581/951) Receiving objects: 62% (590/951) Receiving objects: 63% (600/951) Receiving objects: 64% (609/951) Receiving objects: 65% (619/951) Receiving objects: 66% (628/951) Receiving objects: 67% (638/951) Receiving objects: 68% (647/951) Receiving objects: 69% (657/951) Receiving objects: 70% (666/951) Receiving objects: 71% (676/951) Receiving objects: 72% (685/951) Receiving objects: 73% (695/951) Receiving objects: 74% (704/951) Receiving objects: 75% (714/951) Receiving objects: 76% (723/951) Receiving objects: 77% (733/951) Receiving objects: 78% (742/951) Receiving objects: 79% (752/951) Receiving objects: 80% (761/951) Receiving objects: 81% (771/951) Receiving objects: 82% (780/951) Receiving objects: 83% (790/951) Receiving objects: 84% (799/951) Receiving objects: 85% (809/951) Receiving objects: 86% (818/951) Receiving objects: 87% (828/951) Receiving objects: 88% (837/951) Receiving objects: 89% (847/951) Receiving objects: 90% (856/951) Receiving objects: 91% (866/951) Receiving objects: 92% (875/951) Receiving objects: 93% (885/951) Receiving objects: 94% (894/951) Receiving objects: 95% (904/951) Receiving objects: 96% (913/951) Receiving objects: 97% (923/951) Receiving objects: 98% (932/951) Receiving objects: 99% (942/951) Receiving objects: 100% (951/951) Receiving objects: 100% (951/951), 168.86 KiB, done. Resolving deltas: 2% (24/880) Resolving deltas: 4% (40/880) Resolving deltas: 7% (66/880) Resolving deltas: 8% (74/880) Resolving deltas: 15% (139/880) Resolving deltas: 22% (202/880) Resolving deltas: 23% (205/880) Resolving deltas: 25% (228/880) Resolving deltas: 26% (234/880) Resolving deltas: 27% (243/880) Resolving deltas: 31% (277/880) Resolving deltas: 32% (287/880) Resolving deltas: 33% (297/880) Resolving deltas: 34% (303/880) Resolving deltas: 35% (311/880) Resolving deltas: 36% (323/880) Resolving deltas: 37% (330/880) Resolving deltas: 38% (338/880) Resolving deltas: 39% (348/880) Resolving deltas: 40% (355/880) Resolving deltas: 41% (362/880) Resolving deltas: 42% (374/880) Resolving deltas: 43% (380/880) Resolving deltas: 44% (391/880) Resolving deltas: 45% (396/880) Resolving deltas: 46% (408/880) Resolving deltas: 47% (415/880) Resolving deltas: 48% (426/880) Resolving deltas: 49% (432/880) Resolving deltas: 50% (443/880) Resolving deltas: 51% (450/880) Resolving deltas: 52% (462/880) Resolving deltas: 53% (467/880) Resolving deltas: 54% (480/880) Resolving deltas: 55% (485/880) Resolving deltas: 56% (496/880) Resolving deltas: 57% (503/880) Resolving deltas: 58% (516/880) Resolving deltas: 59% (523/880) Resolving deltas: 60% (531/880) Resolving deltas: 61% (540/880) Resolving deltas: 62% (551/880) Resolving deltas: 63% (556/880) Resolving deltas: 64% (567/880) Resolving deltas: 65% (573/880) Resolving deltas: 66% (588/880) Resolving deltas: 67% (594/880) Resolving deltas: 68% (600/880) Resolving deltas: 69% (614/880) Resolving deltas: 70% (620/880) Resolving deltas: 71% (628/880) Resolving deltas: 72% (641/880) Resolving deltas: 74% (652/880) Resolving deltas: 75% (660/880) Resolving deltas: 76% (670/880) Resolving deltas: 77% (681/880) Resolving deltas: 78% (687/880) Resolving deltas: 79% (699/880) Resolving deltas: 80% (712/880) Resolving deltas: 81% (716/880) Resolving deltas: 82% (727/880) Resolving deltas: 83% (731/880) Resolving deltas: 84% (740/880) Resolving deltas: 85% (752/880) Resolving deltas: 86% (758/880) Resolving deltas: 87% (768/880) Resolving deltas: 91% (804/880) Resolving deltas: 95% (840/880) Resolving deltas: 99% (876/880) Resolving deltas: 100% (880/880) Resolving deltas: 100% (880/880), completed with 89 local objects. From /pub/scm/linux/kernel/git/jgarzik/libata-dev + 0469301...2be5089 upstream -> libata-upstream (forced update) From /pub/scm/linux/kernel/git/roland/infiniband + ea5e137...e49d217 for-2.6.26 -> infiniband (forced update) Checking out files: 5% (86/1557) Checking out files: 6% (94/1557) Checking out files: 7% (109/1557) Checking out files: 8% (125/1557) Checking out files: 9% (141/1557) Checking out files: 10% (156/1557) Checking out files: 11% (172/1557) Checking out files: 12% (187/1557) Checking out files: 13% (203/1557) Checking out files: 14% (218/1557) Checking out files: 15% (234/1557) Checking out files: 16% (250/1557) Checking out files: 17% (265/1557) Checking out files: 18% (281/1557) Checking out files: 19% (296/1557) Checking out files: 20% (312/1557) Checking out files: 20% (317/1557) Checking out files: 21% (327/1557) Checking out files: 22% (343/1557) Checking out files: 22% (353/1557) Checking out files: 23% (359/1557) Checking out files: 24% (374/1557) Checking out files: 25% (390/1557) Checking out files: 26% (405/1557) Checking out files: 27% (421/1557) Checking out files: 28% (436/1557) Checking out files: 29% (452/1557) Checking out files: 30% (468/1557) Checking out files: 30% (482/1557) Checking out files: 31% (483/1557) Checking out files: 32% (499/1557) Checking out files: 33% (514/1557) Checking out files: 34% (530/1557) Checking out files: 35% (545/1557) Checking out files: 36% (561/1557) Checking out files: 37% (577/1557) Checking out files: 38% (592/1557) Checking out files: 39% (608/1557) Checking out files: 40% (623/1557) Checking out files: 41% (639/1557) Checking out files: 42% (654/1557) Checking out files: 43% (670/1557) Checking out files: 44% (686/1557) Checking out files: 45% (701/1557) Checking out files: 46% (717/1557) Checking out files: 47% (732/1557) Checking out files: 48% (748/1557) Checking out files: 49% (763/1557) Checking out files: 50% (779/1557) Checking out files: 51% (795/1557) Checking out files: 52% (810/1557) Checking out files: 53% (826/1557) Checking out files: 54% (841/1557) Checking out files: 55% (857/1557) Checking out files: 56% (872/1557) Checking out files: 57% (888/1557) Checking out files: 58% (904/1557) Checking out files: 59% (919/1557) Checking out files: 60% (935/1557) Checking out files: 61% (950/1557) Checking out files: 62% (966/1557) Checking out files: 63% (981/1557) Checking out files: 64% (997/1557) Checking out files: 64% (1007/1557) Checking out files: 65% (1013/1557) Checking out files: 66% (1028/1557) Checking out files: 67% (1044/1557) Checking out files: 67% (1057/1557) Checking out files: 68% (1059/1557) Checking out files: 69% (1075/1557) Checking out files: 70% (1090/1557) Checking out files: 71% (1106/1557) Checking out files: 72% (1122/1557) Checking out files: 73% (1137/1557) Checking out files: 74% (1153/1557) Checking out files: 74% (1158/1557) Checking out files: 75% (1168/1557) Checking out files: 76% (1184/1557) Checking out files: 77% (1199/1557) Checking out files: 78% (1215/1557) Checking out files: 79% (1231/1557) Checking out files: 80% (1246/1557) Checking out files: 81% (1262/1557) Checking out files: 82% (1277/1557) Checking out files: 83% (1293/1557) Checking out files: 84% (1308/1557) Checking out files: 85% (1324/1557) Checking out files: 86% (1340/1557) Checking out files: 87% (1355/1557) Checking out files: 87% (1360/1557) Checking out files: 88% (1371/1557) Checking out files: 89% (1386/1557) Checking out files: 90% (1402/1557) Checking out files: 91% (1417/1557) Checking out files: 92% (1433/1557) Checking out files: 93% (1449/1557) Checking out files: 94% (1464/1557) Checking out files: 95% (1480/1557) Checking out files: 96% (1495/1557) Checking out files: 97% (1511/1557) Checking out files: 98% (1526/1557) Checking out files: 98% (1535/1557) Checking out files: 99% (1542/1557) Checking out files: 100% (1557/1557) Checking out files: 100% (1557/1557), done. Switched to branch "infiniband" Finished one revert. Checking out files: 32% (495/1544) Checking out files: 33% (510/1544) Checking out files: 34% (525/1544) Checking out files: 35% (541/1544) Checking out files: 36% (556/1544) Checking out files: 37% (572/1544) Checking out files: 38% (587/1544) Checking out files: 39% (603/1544) Checking out files: 40% (618/1544) Checking out files: 41% (634/1544) Checking out files: 42% (649/1544) Checking out files: 43% (664/1544) Checking out files: 44% (680/1544) Checking out files: 45% (695/1544) Checking out files: 46% (711/1544) Checking out files: 46% (725/1544) Checking out files: 47% (726/1544) Checking out files: 48% (742/1544) Checking out files: 49% (757/1544) Checking out files: 50% (772/1544) Checking out files: 51% (788/1544) Checking out files: 52% (803/1544) Checking out files: 53% (819/1544) Checking out files: 54% (834/1544) Checking out files: 55% (850/1544) Checking out files: 56% (865/1544) Checking out files: 57% (881/1544) Checking out files: 58% (896/1544) Checking out files: 59% (911/1544) Checking out files: 60% (927/1544) Checking out files: 61% (942/1544) Checking out files: 62% (958/1544) Checking out files: 63% (973/1544) Checking out files: 64% (989/1544) Checking out files: 64% (994/1544) Checking out files: 65% (1004/1544) Checking out files: 66% (1020/1544) Checking out files: 67% (1035/1544) Checking out files: 68% (1050/1544) Checking out files: 69% (1066/1544) Checking out files: 70% (1081/1544) Checking out files: 71% (1097/1544) Checking out files: 72% (1112/1544) Checking out files: 73% (1128/1544) Checking out files: 74% (1143/1544) Checking out files: 75% (1158/1544) Checking out files: 76% (1174/1544) Checking out files: 77% (1189/1544) Checking out files: 78% (1205/1544) Checking out files: 79% (1220/1544) Checking out files: 80% (1236/1544) Checking out files: 81% (1251/1544) Checking out files: 82% (1267/1544) Checking out files: 83% (1282/1544) Checking out files: 84% (1297/1544) Checking out files: 85% (1313/1544) Checking out files: 86% (1328/1544) Checking out files: 87% (1344/1544) Checking out files: 88% (1359/1544) Checking out files: 89% (1375/1544) Checking out files: 90% (1390/1544) Checking out files: 91% (1406/1544) Checking out files: 91% (1415/1544) Checking out files: 92% (1421/1544) Checking out files: 93% (1436/1544) Checking out files: 94% (1452/1544) Checking out files: 95% (1467/1544) Checking out files: 96% (1483/1544) Checking out files: 97% (1498/1544) Checking out files: 98% (1514/1544) Checking out files: 99% (1529/1544) Checking out files: 100% (1544/1544) Checking out files: 100% (1544/1544), done. Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 14, done. remote: Compressing objects: 10% (1/10)  remote: Compressing objects: 20% (2/10)  remote: Compressing objects: 30% (3/10)  remote: Compressing objects: 40% (4/10)  remote: Compressing objects:remote: 50% (5/10)  remote: Compressing objects: 60% (6/10)  remote: Compressing objects: 70% (7/10)  remote: Compressing objects: 80% (8/10)  remote: Compremote: ressing objects: 90% (9/10)  remote: Compressing objects: 100% (10/10)  remote: Compressing objects: 100% (10/10), done. remote: Total 10 (delta 8)remote: , reused 0 (delta 0) From /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 0fe7d4d..f64ef51 master -> ieee1394 www.linux-mips.org[0: 84.159.85.93]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips' not found. www.linux-mips.org[0: 84.159.85.93]: 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 remote: Counting objects: 1  remote: Counting objects: 732, done. remote: Compressing objects: 0% (1/199)  remote: Compressing objects: 1% (2/199)  remote: Compressing objects: 2% (4/199)  remote: Compressing objects: 3% (6/199)  remote: Compressing objects: 4% (8/199)  remote: Compressing objects: 5% (10/199)  remote: Compressing objects: 6% (12/199)  remote: Compressing objects: 7% (14/199)  remote: Compressing objects: 8% (16/199)  remote: Compressing objects: 9% (18/199)  remote: Compressing objects: 10% (20/199)  remote: Compressing objects: 11% (22/199)  remote: Compressing objects: 12% (24/199)  remote: Compressing objects: 13% (26/199)  remote: Compressing objects: 14% (28/199)  remote: Compressing objects: 15% (30/199)  remote: Compressing objects: 16% (32/199)  remote: Compressing objects: 17% (34/199)  remote: Compressing objects: 18% (36/199)  remote: Compressing objects: 19% (38/199)  remote: Compressing objects: 20% (40/199)  remote: Compressing objects: 21% (42/199)  remote: Compressing objects: 22% (44/199)  remote: Compressing objects: 23% (46/199)  remote: Compressing objects: 24% (48/199)  remote: Compressing objects: 25% (50/199)  remote: Compressing objects: 26% (52/199)  remote: Compressing objects: 27% (54/199)  remote: Compressing objects: 28% (56/199)  remote: Compressing objects: 29% (58/199)  remote: Compressing objects: 30% (60/199)  remote: Compressing objects: 31% (62/199)  remote: Compressing objects: 32% (64/199)  remote: Compressing objects: 33% (66/199)  remote: Compressing objects: 34% (68/199)  remote: Compressing objects: 35% (70/199)  remote: Compressing objects: 36% (72/199)  remote: Compressing objects: 37% (74/199)  remote: Compressing objects: 38% (76/199)  remote: Compressing objects: 39% (78/199)  remote: Compressing objects: 40% (80/199)  remote: Compressing objects: 41% (82/199)  remote: Compressing objects: 42% (84/199)  remote: Compressing objects: 43% (86/199)  remote: Compressing objects: 44% (88/199)  remote: Compressing objects: 45% (90/199)  remote: Compressing objects: 46% (92/199)  remote: Compressing objects: 47% (94/199)  remote: Compressing objects: 48% (96/199)  remote: Compressing objects: 49% (98/199)  remote: Compressing objects: 50% (100/199)  remote: Compressing objects: 51% (102/199)  remote: Compressing objects: 52% (104/199)  remote: Compressing objects: 53% (106/199)  remote: Compressing objects: 54% (108/199)  remote: Compressing objects: 55% (110/199)  remote: Compressing objects: 56% (112/199)  remote: Compressing objects: 57% (114/199)  remote: Compressing objects: 58% (116/199)  remote: Compressing objects: 59% (118/199)  remote: Compressing objects: 60% (120/199)  remote: Compressing objects: 61% (122/199)  remote: Compressing objects: 62% (124/199)  remote: Compressing objects: 63% (126/199)  remote: Compressing objects: 64% (128/199)  remote: Compressing objects: 65% (130/199)  remote: Compressing objects: 66% (132/199)  remote: Compressing objects: 67% (134/199)  remote: Compressing objects: 68% (136/199)  remote: Compressing objects: 69% (138/199)  remote: Compressing objects: 70% (140/199)  remote: Compressing objects: 71% (142/199)  remote: Compressing objects: 72% (144/199)  remote: Compressing objects: 73% (146/199)  remote: Compressing objects: 74% (148/199)  remote: Compressing objects: 75% (150/199)  remote: Compressing objects: 76% (152/199)  remote: Compressing objects: 77% (154/199)  remote: Compressing objects: 78% (156/199)  remote: Compressing objects: 79% (158/199)  remote: Compressing objects: 80% (160/199)  remote: Compressing objects: 81% (162/199)  remote: Compressing objects: 82% (164/199)  remote: Compressing objects: 83% (166/199)  remote: Compressing objects: 84% (168/199)  remote: Compressing objects: 85% (170/199)  remote: Compressing objects: 86% (172/199)  remote: Compressing objects: 87% (174/199)  remote: Compressing objects: 88% (176/199)  remote: Compressing objects: 89% (178/199)  remote: Compressing objects: 90% (180/199)  remote: Compressing objects: 91% (182/199)  remote: Compressing objects: 92% (184/199)  remote: Compressing objects: 93% (186/199)  remote: Compressing objects: 94% (188/199)  remote: Compressing objects: 95% (190/199)  remote: Compressing objects: 96% (192/199)  remote: Compressing objects: 97% (194/199)  remote: Compressing objects: 98% (196/199)  remote: Compressing objects: 99% (198/199)  remote: Compressing objects: 100% (199/199)  remote: Compressing objects: 100% (199/199), done. Receiving objects: 0% (1/599) Receiving objects: 1% (6/599) Receiving objects: 2% (12/599) Receiving objects: 3% (18/599) Receiving objects: 4% (24/599) Receiving objects: 5% (30/599) Receiving objects: 6% (36/599) Receiving objects: 7% (42/599) Receiving objects: 8% (48/599) Receiving objects: 9% (54/599) Receiving objects: 10% (60/599) Receiving objects: 11% (66/599) Receiving objects: 12% (72/599) Receiving objects: 13% (78/599) Receiving objects: 14% (84/599) Receiving objects: 15% (90/599) Receiving objects: 16% (96/599) Receiving objects: 17% (102/599) Receiving objects: 18% (108/599) Receiving objects: 19% (114/599) Receiving objects: 20% (120/599) Receiving objects: 21% (126/599) Receiving objects: 22% (132/599) Receiving objects: 23% (138/599) Receiving objects: 24% (144/599) Receiving objects: 25% (150/599) Receiving objects: 26% (156/599) Receiving objects: 27% (162/599) Receiving objects: 28% (168/599) Receiving objects: 29% (174/599) Receiving objects: 30% (180/599) Receiving objects: 31% (186/599) Receiving objects: 32% (192/599) Receiving objects: 33% (198/599) Receiving objects: 34% (204/599) Receiving objects: 35% (210/599) Receiving objects: 36% (216/599) Receiving objects: 37% (222/599) Receiving objects: 38% (228/599) remote: Total 599 (delta 511), reused 467 (delta 400) Receiving objects: 39% (234/599) Receiving objects: 40% (240/599) Receiving objects: 41% (246/599) Receiving objects: 42% (252/599) Receiving objects: 43% (258/599) Receiving objects: 44% (264/599) Receiving objects: 45% (270/599) Receiving objects: 46% (276/599) Receiving objects: 47% (282/599) Receiving objects: 48% (288/599) Receiving objects: 49% (294/599) Receiving objects: 50% (300/599) Receiving objects: 51% (306/599) Receiving objects: 52% (312/599) Receiving objects: 53% (318/599) Receiving objects: 54% (324/599) Receiving objects: 55% (330/599) Receiving objects: 56% (336/599) Receiving objects: 57% (342/599) Receiving objects: 58% (348/599) Receiving objects: 59% (354/599) Receiving objects: 60% (360/599) Receiving objects: 61% (366/599) Receiving objects: 62% (372/599) Receiving objects: 63% (378/599) Receiving objects: 64% (384/599) Receiving objects: 65% (390/599) Receiving objects: 66% (396/599) Receiving objects: 67% (402/599) Receiving objects: 68% (408/599) Receiving objects: 69% (414/599) Receiving objects: 70% (420/599) Receiving objects: 71% (426/599) Receiving objects: 72% (432/599) Receiving objects: 73% (438/599) Receiving objects: 74% (444/599) Receiving objects: 75% (450/599) Receiving objects: 76% (456/599) Receiving objects: 77% (462/599) Receiving objects: 78% (468/599) Receiving objects: 79% (474/599) Receiving objects: 80% (480/599) Receiving objects: 81% (486/599) Receiving objects: 82% (492/599) Receiving objects: 83% (498/599) Receiving objects: 84% (504/599) Receiving objects: 85% (510/599) Receiving objects: 86% (516/599) Receiving objects: 87% (522/599) Receiving objects: 88% (528/599) Receiving objects: 89% (534/599) Receiving objects: 90% (540/599) Receiving objects: 91% (546/599) Receiving objects: 92% (552/599) Receiving objects: 93% (558/599) Receiving objects: 94% (564/599) Receiving objects: 95% (570/599) Receiving objects: 96% (576/599) Receiving objects: 97% (582/599) Receiving objects: 98% (588/599) Receiving objects: 99% (594/599) Receiving objects: 100% (599/599) Receiving objects: 100% (599/599), 197.73 KiB, done. Resolving deltas: 0% (1/511) Resolving deltas: 1% (6/511) Resolving deltas: 2% (11/511) Resolving deltas: 3% (17/511) Resolving deltas: 17% (91/511) Resolving deltas: 25% (128/511) Resolving deltas: 31% (162/511) Resolving deltas: 38% (196/511) Resolving deltas: 40% (208/511) Resolving deltas: 41% (210/511) Resolving deltas: 42% (216/511) Resolving deltas: 44% (225/511) Resolving deltas: 45% (231/511) Resolving deltas: 48% (246/511) Resolving deltas: 49% (252/511) Resolving deltas: 50% (260/511) Resolving deltas: 51% (264/511) Resolving deltas: 52% (266/511) Resolving deltas: 53% (271/511) Resolving deltas: 55% (283/511) Resolving deltas: 56% (287/511) Resolving deltas: 57% (292/511) Resolving deltas: 58% (297/511) Resolving deltas: 59% (303/511) Resolving deltas: 60% (307/511) Resolving deltas: 61% (314/511) Resolving deltas: 62% (320/511) Resolving deltas: 63% (322/511) Resolving deltas: 66% (338/511) Resolving deltas: 67% (343/511) Resolving deltas: 68% (348/511) Resolving deltas: 70% (359/511) Resolving deltas: 71% (364/511) Resolving deltas: 72% (368/511) Resolving deltas: 79% (405/511) Resolving deltas: 80% (409/511) Resolving deltas: 81% (415/511) Resolving deltas: 83% (425/511) Resolving deltas: 84% (432/511) Resolving deltas: 85% (435/511) Resolving deltas: 86% (441/511) Resolving deltas: 87% (445/511) Resolving deltas: 88% (450/511) Resolving deltas: 89% (459/511) Resolving deltas: 90% (460/511) Resolving deltas: 91% (466/511) Resolving deltas: 92% (473/511) Resolving deltas: 93% (476/511) Resolving deltas: 94% (481/511) Resolving deltas: 95% (486/511) Resolving deltas: 96% (491/511) Resolving deltas: 98% (505/511) Resolving deltas: 99% (508/511) Resolving deltas: 100% (511/511) Resolving deltas: 100% (511/511), completed with 129 local objects. From /pub/scm/linux/kernel/git/davem/net-2.6.26 8eefca4..c0b8c32 master -> net Already on "2.6.25-rc8-mc16" 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-mc16" 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 From /pub/scm/linux/kernel/git/jmorris/selinux-2.6 869ab51..5a55261 for-linus -> selinux-linus warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection remote: Counting objects: 368, done. remote: Compressing objects: 2% (1/39)  remote: Compressing objects: 5% (2/39)  remote: Compressing objects: 7% (3/39)  remote: Compressing objects: 10% (4/39)  remote: Compressing objects: 12% (5/39)  remote: Compressing objects: 15% (6/39)  remote: Compressing objects: 17% (7/39)  remote: Compressing objects:remote: 20% (8/39)  remote: Compressing objects: 23% (9/39)  remote: Compressing objects: 25% (10/39)  remote: Compressing objects: 28% (11/39)  remote: Coremote: mpressing objects: 30% (12/39)  remote: Compressing objects: 33% (13/39)  remote: Compressing objects: 35% (14/39)  remote: Compressing objectsremote: : 38% (15/39)  remote: Compressing objects: 41% (16/39)  remote: Compressing objects: 43% (17/39)  remote: Compressing objects: 46% (18/39)  remote: remote: Compressing objects: 48% (19/39)  remote: Compressing objects: 51% (20/39)  remote: Compressing objects: 53% (21/39)  remote: Compressing objeremote: cts: 56% (22/39)  remote: Compressing objects: 58% (23/39)  remote: Compressing objects: 61% (24/39)  remote: Compressing objects: 64% (25/39)remote:  remote: Compressing objects: 66% (26/39)  remote: Compressing objects: 69% (27/39)  remote: Compressing objects: 71% (28/39)  remote: Compressing oremote: bjects: 74% (29/39)  remote: Compressing objects: 76% (30/39)  remote: Compressing objects: 79% (31/39)  remote: Compressing objects: 82% (32/remote: 39)  remote: Compressing objects: 84% (33/39)  remote: Compressing objects: 87% (34/39)  remote: Compressing objects: 89% (35/39)  remote: Compressinremote: g objects: 92% (36/39)  remote: Compressing objects: 94% (37/39)  remote: Compressing objects: 97% (38/39)  remote: Compressing objects: 100% (remote: 39/39)  remote: Compressing objects: 100% (39/39), done. Receiving objects: 0% (1/278) Receiving objects: 1% (3/278) Receiving objects: 2% (6/278) Receiving objects: 3% (9/278) Receiving objects: 4% (12/278) Receiving objects: 5% (14/278) Receiving objects: 6% (17/278) Receiving objects: 7% (20/278) Receiving objects: 8% (23/278) Receiving objects: 9% (26/278) Receiving objects: 10% (28/278) Receiving objects: 11% (31/278) Receiving objects: 12% (34/278) Receiving objects: 13% (37/278) Receiving objects: 14% (39/278) Receiving objects: 15% (42/278) Receiving objects: 16% (45/278) Receiving objects: 17% (48/278) Receiving objects: 18% (51/278) Receiving objects: 19% (53/278) Receiving objects: 20% (56/278) Receiving objects: 21% (59/278) Receiving objects: 22% (62/278) Receiving objects: 23% (64/278) Receiving objects: 24% (67/278) Receiving objects: 25% (70/278) Receiving objects: 26% (73/278) Receiving objects: 27% (76/278) Receiving objects: 28% (78/278) Receiving objects: 29% (81/278) Receiving objects: 30% (84/278) Receiving objects: 31% (87/278) Receiving objects: 32% (89/278) Receiving objects: 33% (92/278) Receiving objects: 34% (95/278) Receiving objects: 35% (98/278) Receiving objects: 36% (101/278) Receiving objects: 37% (103/278) Receiving objects: 38% (106/278) Receiving objects: 39% (109/278) Receiving objects: 40% (112/278) Receiving objects: 41% (114/278) Receiving objects: 42% (117/278) Receiving objects: 43% (120/278) Receiving objects: 44% (123/278) Receiving objects: 45% (126/278) Receiving objects: 46% (128/278) Receiving objects: 47% (131/278) Receiving objects: 48% (134/278) Receiving objects: 49% (137/278) Receiving objects: 50% (139/278) Receiving objects: 51% (142/278) Receiving objects: 52% (145/278) Receiving objects: 53% (148/278) Receiving objects: 54% (151/278) Receiving objects: 55% (153/278) Receiving objects: 56% (156/278) Receiving objects: 57% (159/278) remote: Total 278 (delta 242), reused 275 (delta 239) Receiving objects: 58% (162/278) Receiving objects: 59% (165/278) Receiving objects: 60% (167/278) Receiving objects: 61% (170/278) Receiving objects: 62% (173/278) Receiving objects: 63% (176/278) Receiving objects: 64% (178/278) Receiving objects: 65% (181/278) Receiving objects: 66% (184/278) Receiving objects: 67% (187/278) Receiving objects: 68% (190/278) Receiving objects: 69% (192/278) Receiving objects: 70% (195/278) Receiving objects: 71% (198/278) Receiving objects: 72% (201/278) Receiving objects: 73% (203/278) Receiving objects: 74% (206/278) Receiving objects: 75% (209/278) Receiving objects: 76% (212/278) Receiving objects: 77% (215/278) Receiving objects: 78% (217/278) Receiving objects: 79% (220/278) Receiving objects: 80% (223/278) Receiving objects: 81% (226/278) Receiving objects: 82% (228/278) Receiving objects: 83% (231/278) Receiving objects: 84% (234/278) Receiving objects: 85% (237/278) Receiving objects: 86% (240/278) Receiving objects: 87% (242/278) Receiving objects: 88% (245/278) Receiving objects: 89% (248/278) Receiving objects: 90% (251/278) Receiving objects: 91% (253/278) Receiving objects: 92% (256/278) Receiving objects: 93% (259/278) Receiving objects: 94% (262/278) Receiving objects: 95% (265/278) Receiving objects: 96% (267/278) Receiving objects: 97% (270/278) Receiving objects: 98% (273/278) Receiving objects: 99% (276/278) Receiving objects: 100% (278/278) Receiving objects: 100% (278/278), 40.19 KiB, done. Resolving deltas: 1% (4/242) Resolving deltas: 2% (6/242) Resolving deltas: 20% (49/242) Resolving deltas: 37% (91/242) Resolving deltas: 54% (132/242) Resolving deltas: 57% (139/242) Resolving deltas: 58% (141/242) Resolving deltas: 59% (143/242) Resolving deltas: 60% (146/242) Resolving deltas: 61% (148/242) Resolving deltas: 62% (151/242) Resolving deltas: 63% (154/242) Resolving deltas: 67% (164/242) Resolving deltas: 68% (166/242) Resolving deltas: 69% (168/242) Resolving deltas: 71% (174/242) Resolving deltas: 72% (175/242) Resolving deltas: 73% (179/242) Resolving deltas: 74% (181/242) Resolving deltas: 76% (184/242) Resolving deltas: 77% (187/242) Resolving deltas: 78% (189/242) Resolving deltas: 79% (192/242) Resolving deltas: 80% (195/242) Resolving deltas: 81% (197/242) Resolving deltas: 84% (205/242) Resolving deltas: 85% (206/242) Resolving deltas: 86% (209/242) Resolving deltas: 89% (216/242) Resolving deltas: 91% (221/242) Resolving deltas: 92% (223/242) Resolving deltas: 93% (226/242) Resolving deltas: 94% (228/242) Resolving deltas: 95% (230/242) Resolving deltas: 97% (235/242) Resolving deltas: 99% (240/242) Resolving deltas: 100% (242/242) Resolving deltas: 100% (242/242), completed with 55 local objects. From git://oss.sgi.com:8090/xfs/xfs-2.6 329e0dc..0c444a2 master -> xfs warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection remote: Counting objects: 6860, done. remote: Compressing objects: 0% (1/822)  remote: Compressing objects: 1% (9/822)  remote: Compressing objects: 2% (17/822)  remote: Compressing objects: 3% (25/822)  remote: Compressing objects: 4% (33/822)  remote: Compressing objects: 5% (42/822)  remote: Compressing objects: 6% (50/822)  remote: Compressing objects: 7% (58/822)  remote: Compressing objects: 8% (66/822)  remote: Compressing objects: 9% (74/822)  remote: Compressing objects: 10% (83/822)  remote: Compressing objects: 11% (91/822)  remote: Compressing objects: 12% (99/822)  remote: Compressing objects: 13% (107/822)  remote: Compressing objects: 14% (116/822)  remote: Compressing objects: 15% (124/822)  remote: Compressing objects: 16% (132/822)  remote: Compressing objects: 17% (140/822)  remote: Compressing objects: 18% (148/822)  remote: Compressing objects: 19% (157/822)  remote: Compressing objects: 20% (165/822)  remote: Compressing objects: 21% (173/822)  remote: Compressing objects: 22% (181/822)  remote: Compressing objects: 23% (190/822)  remote: Compressing objects: 24% (198/822)  remote: Compressing objects: 25% (206/822)  remote: Compressing objects: 26% (214/822)  remote: Compressing objects: 27% (222/822)  remote: Compressing objects: 28% (231/822)  remote: Compressing objects: 29% (239/822)  remote: Compressing objects: 30% (247/822)  remote: Compressing objects: 31% (255/822)  remote: Compressing objects: 32% (264/822)  remote: Compressing objects: 33% (272/822)  remote: Compressing objects: 34% (280/822)  remote: Compressing objects: 35% (288/822)  remote: Compressing objects: 36% (296/822)  remote: Compressing objects: 37% (305/822)  remote: Compressing objects: 38% (313/822)  remote: Compressing objects: 39% (321/822)  remote: Compressing objects: 40% (329/822)  remote: Compressing objects: 41% (338/822)  remote: Compressing objects: 42% (346/822)  remote: Compressing objects: 43% (354/822)  remote: Compressing objects: 44% (362/822)  remote: Compressing objects: 45% (370/822)  remote: Compressing objects: 46% (379/822)  remote: Compressing objects: 47% (387/822)  remote: Compressing objects: 48% (395/822)  remote: Compressing objects: 49% (403/822)  remote: Compressing objects: 50% (411/822)  remote: Compressing objects: 51% (420/822)  remote: Compressing objects: 52% (428/822)  remote: Compressing objects: 53% (436/822)  remote: Compressing objects: 54% (444/822)  remote: Compressing objects: 55% (453/822)  remote: Compressing objects: 56% (461/822)  remote: Compressing objects: 57% (469/822)  remote: Compressing objects: 58% (477/822)  remote: Compressing objects: 59% (485/822)  remote: Compressing objects: 60% (494/822)  remote: Compressing objects: 61% (502/822)  remote: Compressing objects: 62% (510/822)  remote: Compressing objects: 63% (518/822)  remote: Compressing objects: 64% (527/822)  remote: Compressing objects: 65% (535/822)  remote: Compressing objects: 66% (543/822)  remote: Compressing objects: 67% (551/822)  remote: Compressing objects: 68% (559/822)  remote: Compressing objects: 69% (568/822)  remote: Compressing objects: 70% (576/822)  remote: Compressing objects: 71% (584/822)  remote: Compressing objects: 72% (592/822)  remote: Compressing objects: 73% (601/822)  remote: Compressing objects: 74% (609/822)  remote: Compressing objects: 75% (617/822)  remote: Compressing objects: 76% (625/822)  remote: Compressing objects: 77% (633/822)  remote: Compressing objects: 78% (642/822)  remote: Compressing objects: 79% (650/822)  remote: Compressing objects: 80% (658/822)  remote: Compressing objects: 81% (666/822)  remote: Compressing objects: 82% (675/822)  remote: Compressing objects: 83% (683/822)  remote: Compressing objects: 84% (691/822)  remote: Compressing objects: 85% (699/822)  remote: Compressing objects: 86% (707/822)  remote: Compressing objects: 87% (716/822)  remote: Compressing objects: 88% (724/822)  remote: Compressing objects: 89% (732/822)  remote: Compressing objects: 90% (740/822)  remote: Compressing objects: 91% (749/822)  remote: Compressing objects: 92% (757/822)  remote: Compressing objects: 93% (765/822)  remote: Compressing objects: 94% (773/822)  remote: Compressing objects: 95% (781/822)  remote: Compressing objects: 96% (790/822)  remote: Compressing objects: 97% (798/822)  remote: Compressing objects: 98% (806/822)  remote: Compressing objects: 99% (814/822)  remote: Compressing objects: 100% (822/822)  remote: Compressing objects: 100% (822/822), done. Receiving objects: 0% (1/6263) Receiving objects: 1% (63/6263) Receiving objects: 2% (126/6263) Receiving objects: 3% (188/6263) Receiving objects: 4% (251/6263) Receiving objects: 5% (314/6263) Receiving objects: 6% (376/6263) Receiving objects: 7% (439/6263) Receiving objects: 8% (502/6263) Receiving objects: 9% (564/6263) Receiving objects: 10% (627/6263) Receiving objects: 11% (689/6263) Receiving objects: 12% (752/6263) Receiving objects: 13% (815/6263) Receiving objects: 14% (877/6263) Receiving objects: 15% (940/6263) Receiving objects: 16% (1003/6263) Receiving objects: 17% (1065/6263) Receiving objects: 18% (1128/6263) Receiving objects: 19% (1190/6263) Receiving objects: 20% (1253/6263) Receiving objects: 21% (1316/6263) Receiving objects: 22% (1378/6263) Receiving objects: 23% (1441/6263) Receiving objects: 24% (1504/6263) Receiving objects: 25% (1566/6263) Receiving objects: 26% (1629/6263) Receiving objects: 27% (1692/6263) Receiving objects: 28% (1754/6263) Receiving objects: 29% (1817/6263) Receiving objects: 30% (1879/6263) Receiving objects: 31% (1942/6263) Receiving objects: 32% (2005/6263) Receiving objects: 33% (2067/6263) Receiving objects: 34% (2130/6263) Receiving objects: 35% (2193/6263) Receiving objects: 36% (2255/6263) Receiving objects: 37% (2318/6263) Receiving objects: 38% (2380/6263) Receiving objects: 39% (2443/6263) Receiving objects: 40% (2506/6263) Receiving objects: 41% (2568/6263) Receiving objects: 42% (2631/6263) Receiving objects: 43% (2694/6263) Receiving objects: 44% (2756/6263) Receiving objects: 45% (2819/6263) Receiving objects: 46% (2881/6263) Receiving objects: 47% (2944/6263) Receiving objects: 48% (3007/6263) Receiving objects: 49% (3069/6263) Receiving objects: 50% (3132/6263) Receiving objects: 51% (3195/6263) Receiving objects: 52% (3257/6263) Receiving objects: 53% (3320/6263) Receiving objects: 54% (3383/6263) Receiving objects: 55% (3445/6263) Receiving objects: 56% (3508/6263) Receiving objects: 57% (3570/6263) Receiving objects: 58% (3633/6263) Receiving objects: 59% (3696/6263) Receiving objects: 60% (3758/6263) Receiving objects: 61% (3821/6263) Receiving objects: 62% (3884/6263) Receiving objects: 63% (3946/6263) Receiving objects: 64% (4009/6263) Receiving objects: 65% (4071/6263) Receiving objects: 66% (4134/6263) Receiving objects: 67% (4197/6263) Receiving objects: 68% (4259/6263) Receiving objects: 69% (4322/6263) Receiving objects: 70% (4385/6263) Receiving objects: 71% (4447/6263) Receiving objects: 72% (4510/6263) remote: Total 6263 (delta 5436), reused 6263 (delta 5436) Receiving objects: 73% (4572/6263) Receiving objects: 74% (4635/6263) Receiving objects: 75% (4698/6263) Receiving objects: 76% (4760/6263) Receiving objects: 77% (4823/6263) Receiving objects: 78% (4886/6263) Receiving objects: 79% (4948/6263) Receiving objects: 80% (5011/6263) Receiving objects: 81% (5074/6263) Receiving objects: 82% (5136/6263) Receiving objects: 83% (5199/6263) Receiving objects: 84% (5261/6263) Receiving objects: 85% (5324/6263) Receiving objects: 86% (5387/6263) Receiving objects: 87% (5449/6263) Receiving objects: 88% (5512/6263) Receiving objects: 89% (5575/6263) Receiving objects: 90% (5637/6263) Receiving objects: 91% (5700/6263) Receiving objects: 92% (5762/6263) Receiving objects: 93% (5825/6263) Receiving objects: 94% (5888/6263) Receiving objects: 95% (5950/6263) Receiving objects: 96% (6013/6263) Receiving objects: 97% (6076/6263) Receiving objects: 98% (6138/6263) Receiving objects: 99% (6201/6263) Receiving objects: 100% (6263/6263) Receiving objects: 100% (6263/6263), 959.10 KiB, done. Resolving deltas: 0% (5/5436) Resolving deltas: 1% (82/5436) Resolving deltas: 2% (110/5436) Resolving deltas: 7% (388/5436) Resolving deltas: 8% (483/5436) Resolving deltas: 9% (524/5436) Resolving deltas: 10% (545/5436) Resolving deltas: 11% (602/5436) Resolving deltas: 12% (676/5436) Resolving deltas: 13% (730/5436) Resolving deltas: 15% (849/5436) Resolving deltas: 16% (875/5436) Resolving deltas: 17% (930/5436) Resolving deltas: 24% (1311/5436) Resolving deltas: 29% (1587/5436) Resolving deltas: 30% (1669/5436) Resolving deltas: 31% (1733/5436) Resolving deltas: 35% (1929/5436) Resolving deltas: 38% (2070/5436) Resolving deltas: 41% (2246/5436) Resolving deltas: 52% (2859/5436) Resolving deltas: 53% (2899/5436) Resolving deltas: 54% (2939/5436) Resolving deltas: 55% (2991/5436) Resolving deltas: 56% (3050/5436) Resolving deltas: 57% (3107/5436) Resolving deltas: 58% (3153/5436) Resolving deltas: 59% (3210/5436) Resolving deltas: 60% (3283/5436) Resolving deltas: 61% (3321/5436) Resolving deltas: 62% (3371/5436) Resolving deltas: 63% (3429/5436) Resolving deltas: 64% (3485/5436) Resolving deltas: 65% (3554/5436) Resolving deltas: 66% (3589/5436) Resolving deltas: 74% (4027/5436) Resolving deltas: 75% (4080/5436) Resolving deltas: 76% (4132/5436) Resolving deltas: 77% (4190/5436) Resolving deltas: 78% (4245/5436) Resolving deltas: 79% (4301/5436) Resolving deltas: 80% (4349/5436) Resolving deltas: 81% (4405/5436) Resolving deltas: 82% (4459/5436) Resolving deltas: 83% (4513/5436) Resolving deltas: 84% (4567/5436) Resolving deltas: 85% (4623/5436) Resolving deltas: 91% (4979/5436) Resolving deltas: 92% (5047/5436) Resolving deltas: 93% (5087/5436) Resolving deltas: 94% (5116/5436) Resolving deltas: 95% (5217/5436) Resolving deltas: 97% (5278/5436) Resolving deltas: 98% (5341/5436) Resolving deltas: 99% (5428/5436) Resolving deltas: 100% (5436/5436) Resolving deltas: 100% (5436/5436), completed with 566 local objects. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + d3278ed...a9efd12 master -> x86 (forced update) Checking out files: 18% (579/3214) Checking out files: 19% (611/3214) Checking out files: 20% (643/3214) Checking out files: 21% (675/3214) Checking out files: 22% (708/3214) Checking out files: 23% (740/3214) Checking out files: 24% (772/3214) Checking out files: 25% (804/3214) Checking out files: 26% (836/3214) Checking out files: 27% (868/3214) Checking out files: 28% (900/3214) Checking out files: 29% (933/3214) Checking out files: 29% (942/3214) Checking out files: 30% (965/3214) Checking out files: 31% (997/3214) Checking out files: 32% (1029/3214) Checking out files: 33% (1061/3214) Checking out files: 33% (1086/3214) Checking out files: 34% (1093/3214) Checking out files: 35% (1125/3214) Checking out files: 36% (1158/3214) Checking out files: 37% (1190/3214) Checking out files: 38% (1222/3214) Checking out files: 39% (1254/3214) Checking out files: 40% (1286/3214) Checking out files: 41% (1318/3214) Checking out files: 42% (1350/3214) Checking out files: 43% (1383/3214) Checking out files: 44% (1415/3214) Checking out files: 45% (1447/3214) Checking out files: 46% (1479/3214) Checking out files: 47% (1511/3214) Checking out files: 48% (1543/3214) Checking out files: 49% (1575/3214) Checking out files: 50% (1607/3214) Checking out files: 51% (1640/3214) Checking out files: 52% (1672/3214) Checking out files: 53% (1704/3214) Checking out files: 54% (1736/3214) Checking out files: 55% (1768/3214) Checking out files: 56% (1800/3214) Checking out files: 57% (1832/3214) Checking out files: 58% (1865/3214) Checking out files: 58% (1867/3214) Checking out files: 59% (1897/3214) Checking out files: 60% (1929/3214) Checking out files: 61% (1961/3214) Checking out files: 62% (1993/3214) Checking out files: 63% (2025/3214) Checking out files: 64% (2057/3214) Checking out files: 65% (2090/3214) Checking out files: 66% (2122/3214) Checking out files: 67% (2154/3214) Checking out files: 68% (2186/3214) Checking out files: 69% (2218/3214) Checking out files: 70% (2250/3214) Checking out files: 71% (2282/3214) Checking out files: 71% (2288/3214) Checking out files: 72% (2315/3214) Checking out files: 73% (2347/3214) Checking out files: 74% (2379/3214) Checking out files: 75% (2411/3214) Checking out files: 76% (2443/3214) Checking out files: 77% (2475/3214) Checking out files: 78% (2507/3214) Checking out files: 79% (2540/3214) Checking out files: 80% (2572/3214) Checking out files: 81% (2604/3214) Checking out files: 82% (2636/3214) Checking out files: 83% (2668/3214) Checking out files: 84% (2700/3214) Checking out files: 85% (2732/3214) Checking out files: 86% (2765/3214) Checking out files: 86% (2793/3214) Checking out files: 87% (2797/3214) Checking out files: 88% (2829/3214) Checking out files: 89% (2861/3214) Checking out files: 90% (2893/3214) Checking out files: 91% (2925/3214) Checking out files: 92% (2957/3214) Checking out files: 93% (2990/3214) Checking out files: 94% (3022/3214) Checking out files: 95% (3054/3214) Checking out files: 96% (3086/3214) Checking out files: 97% (3118/3214) Checking out files: 98% (3150/3214) Checking out files: 99% (3182/3214) Checking out files: 100% (3214/3214) Checking out files: 100% (3214/3214), done. Switched to branch "x86" Finished one revert. Checking out files: 26% (853/3213) Checking out files: 27% (868/3213) Checking out files: 28% (900/3213) Checking out files: 29% (932/3213) Checking out files: 30% (964/3213) Checking out files: 31% (997/3213) Checking out files: 32% (1029/3213) Checking out files: 33% (1061/3213) Checking out files: 34% (1093/3213) Checking out files: 35% (1125/3213) Checking out files: 36% (1157/3213) Checking out files: 37% (1189/3213) Checking out files: 38% (1221/3213) Checking out files: 39% (1254/3213) Checking out files: 40% (1286/3213) Checking out files: 41% (1318/3213) Checking out files: 41% (1340/3213) Checking out files: 42% (1350/3213) Checking out files: 43% (1382/3213) Checking out files: 44% (1414/3213) Checking out files: 45% (1446/3213) Checking out files: 46% (1478/3213) Checking out files: 47% (1511/3213) Checking out files: 48% (1543/3213) Checking out files: 49% (1575/3213) Checking out files: 50% (1607/3213) Checking out files: 51% (1639/3213) Checking out files: 52% (1671/3213) Checking out files: 53% (1703/3213) Checking out files: 54% (1736/3213) Checking out files: 55% (1768/3213) Checking out files: 56% (1800/3213) Checking out files: 57% (1832/3213) Checking out files: 58% (1864/3213) Checking out files: 58% (1874/3213) Checking out files: 59% (1896/3213) Checking out files: 60% (1928/3213) Checking out files: 61% (1960/3213) Checking out files: 62% (1993/3213) Checking out files: 62% (1996/3213) Checking out files: 63% (2025/3213) Checking out files: 64% (2057/3213) Checking out files: 65% (2089/3213) Checking out files: 66% (2121/3213) Checking out files: 67% (2153/3213) Checking out files: 68% (2185/3213) Checking out files: 69% (2217/3213) Checking out files: 70% (2250/3213) Checking out files: 70% (2265/3213) Checking out files: 71% (2282/3213) Checking out files: 72% (2314/3213) Checking out files: 73% (2346/3213) Checking out files: 74% (2378/3213) Checking out files: 75% (2410/3213) Checking out files: 76% (2442/3213) Checking out files: 77% (2475/3213) Checking out files: 78% (2507/3213) Checking out files: 79% (2539/3213) Checking out files: 80% (2571/3213) Checking out files: 81% (2603/3213) Checking out files: 82% (2635/3213) Checking out files: 83% (2667/3213) Checking out files: 84% (2699/3213) Checking out files: 85% (2732/3213) Checking out files: 86% (2764/3213) Checking out files: 87% (2796/3213) Checking out files: 88% (2828/3213) Checking out files: 89% (2860/3213) Checking out files: 90% (2892/3213) Checking out files: 91% (2924/3213) Checking out files: 92% (2956/3213) Checking out files: 93% (2989/3213) Checking out files: 94% (3021/3213) Checking out files: 95% (3053/3213) Checking out files: 96% (3085/3213) Checking out files: 96% (3109/3213) Checking out files: 97% (3117/3213) Checking out files: 98% (3149/3213) Checking out files: 99% (3181/3213) Checking out files: 100% (3213/3213) Checking out files: 100% (3213/3213), done. Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" 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: 1% (66/3372) Checking out files: 2% (68/3372) Checking out files: 2% (79/3372) Checking out files: 2% (80/3372) Checking out files: 3% (102/3372) Checking out files: 4% (135/3372) Checking out files: 5% (169/3372) Checking out files: 6% (203/3372) Checking out files: 7% (237/3372) Checking out files: 8% (270/3372) Checking out files: 9% (304/3372) Checking out files: 10% (338/3372) Checking out files: 11% (371/3372) Checking out files: 12% (405/3372) Checking out files: 13% (439/3372) Checking out files: 14% (473/3372) Checking out files: 15% (506/3372) Checking out files: 16% (540/3372) Checking out files: 17% (574/3372) Checking out files: 18% (607/3372) Checking out files: 19% (641/3372) Checking out files: 19% (642/3372) Checking out files: 20% (675/3372) Checking out files: 21% (709/3372) Checking out files: 22% (742/3372) Checking out files: 23% (776/3372) Checking out files: 24% (810/3372) Checking out files: 25% (843/3372) Checking out files: 26% (877/3372) Checking out files: 27% (911/3372) Checking out files: 28% (945/3372) Checking out files: 29% (978/3372) Checking out files: 30% (1012/3372) Checking out files: 31% (1046/3372) Checking out files: 32% (1080/3372) Checking out files: 33% (1113/3372) Checking out files: 34% (1147/3372) Checking out files: 35% (1181/3372) Checking out files: 36% (1214/3372) Checking out files: 37% (1248/3372) Checking out files: 38% (1282/3372) Checking out files: 39% (1316/3372) Checking out files: 40% (1349/3372) Checking out files: 41% (1383/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: 45% (1549/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: 58% (1963/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: 66% (2241/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: 70% (2371/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: 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: 87% (2950/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 "doc" Checking out files: 14% (480/3382) Checking out files: 15% (508/3382) Checking out files: 16% (542/3382) Checking out files: 17% (575/3382) Checking out files: 17% (582/3382) Checking out files: 18% (609/3382) Checking out files: 19% (643/3382) Checking out files: 20% (677/3382) Checking out files: 20% (679/3382) Checking out files: 21% (711/3382) Checking out files: 22% (745/3382) Checking out files: 23% (778/3382) Checking out files: 24% (812/3382) Checking out files: 25% (846/3382) Checking out files: 25% (874/3382) Checking out files: 26% (880/3382) Checking out files: 27% (914/3382) Checking out files: 28% (947/3382) Checking out files: 29% (981/3382) Checking out files: 30% (1015/3382) Checking out files: 31% (1049/3382) Checking out files: 32% (1083/3382) Checking out files: 33% (1117/3382) Checking out files: 34% (1150/3382) Checking out files: 35% (1184/3382) Checking out files: 36% (1218/3382) Checking out files: 37% (1252/3382) Checking out files: 38% (1286/3382) Checking out files: 39% (1319/3382) Checking out files: 40% (1353/3382) Checking out files: 41% (1387/3382) Checking out files: 42% (1421/3382) Checking out files: 43% (1455/3382) Checking out files: 44% (1489/3382) Checking out files: 45% (1522/3382) Checking out files: 46% (1556/3382) Checking out files: 47% (1590/3382) Checking out files: 48% (1624/3382) Checking out files: 49% (1658/3382) Checking out files: 50% (1691/3382) Checking out files: 51% (1725/3382) Checking out files: 52% (1759/3382) Checking out files: 53% (1793/3382) Checking out files: 54% (1827/3382) Checking out files: 55% (1861/3382) Checking out files: 56% (1894/3382) Checking out files: 57% (1928/3382) Checking out files: 58% (1962/3382) Checking out files: 58% (1970/3382) Checking out files: 59% (1996/3382) Checking out files: 60% (2030/3382) Checking out files: 60% (2063/3382) Checking out files: 61% (2064/3382) Checking out files: 62% (2097/3382) Checking out files: 63% (2131/3382) Checking out files: 63% (2141/3382) Checking out files: 64% (2165/3382) Checking out files: 65% (2199/3382) Checking out files: 66% (2233/3382) Checking out files: 67% (2266/3382) Checking out files: 68% (2300/3382) Checking out files: 69% (2334/3382) Checking out files: 70% (2368/3382) Checking out files: 71% (2402/3382) Checking out files: 72% (2436/3382) Checking out files: 73% (2469/3382) Checking out files: 74% (2503/3382) Checking out files: 75% (2537/3382) Checking out files: 76% (2571/3382) Checking out files: 77% (2605/3382) Checking out files: 78% (2638/3382) Checking out files: 79% (2672/3382) Checking out files: 80% (2706/3382) Checking out files: 81% (2740/3382) Checking out files: 82% (2774/3382) Checking out files: 83% (2808/3382) Checking out files: 84% (2841/3382) Checking out files: 85% (2875/3382) Checking out files: 86% (2909/3382) Checking out files: 87% (2943/3382) Checking out files: 88% (2977/3382) Checking out files: 88% (2994/3382) Checking out files: 88% (3003/3382) Checking out files: 89% (3010/3382) Checking out files: 90% (3044/3382) Checking out files: 91% (3078/3382) Checking out files: 92% (3112/3382) Checking out files: 93% (3146/3382) Checking out files: 94% (3180/3382) Checking out files: 95% (3213/3382) Checking out files: 96% (3247/3382) Checking out files: 97% (3281/3382) Checking out files: 98% (3315/3382) Checking out files: 99% (3349/3382) Checking out files: 100% (3382/3382) Checking out files: 100% (3382/3382), done. Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" 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: 9% (318/3322) Checking out files: 10% (333/3322) Checking out files: 11% (366/3322) Checking out files: 12% (399/3322) Checking out files: 13% (432/3322) Checking out files: 14% (466/3322) Checking out files: 15% (499/3322) Checking out files: 16% (532/3322) Checking out files: 17% (565/3322) Checking out files: 18% (598/3322) Checking out files: 19% (632/3322) Checking out files: 20% (665/3322) Checking out files: 20% (697/3322) Checking out files: 21% (698/3322) Checking out files: 22% (731/3322) Checking out files: 23% (765/3322) Checking out files: 24% (798/3322) Checking out files: 25% (831/3322) Checking out files: 26% (864/3322) Checking out files: 27% (897/3322) Checking out files: 27% (899/3322) Checking out files: 28% (931/3322) Checking out files: 29% (964/3322) Checking out files: 30% (997/3322) Checking out files: 31% (1030/3322) Checking out files: 32% (1064/3322) Checking out files: 33% (1097/3322) Checking out files: 34% (1130/3322) Checking out files: 35% (1163/3322) Checking out files: 36% (1196/3322) Checking out files: 37% (1230/3322) Checking out files: 38% (1263/3322) Checking out files: 39% (1296/3322) Checking out files: 40% (1329/3322) Checking out files: 41% (1363/3322) Checking out files: 42% (1396/3322) Checking out files: 43% (1429/3322) Checking out files: 43% (1441/3322) Checking out files: 44% (1462/3322) Checking out files: 45% (1495/3322) Checking out files: 46% (1529/3322) Checking out files: 47% (1562/3322) Checking out files: 47% (1580/3322) Checking out files: 48% (1595/3322) Checking out files: 49% (1628/3322) Checking out files: 50% (1661/3322) Checking out files: 51% (1695/3322) Checking out files: 52% (1728/3322) Checking out files: 53% (1761/3322) Checking out files: 54% (1794/3322) Checking out files: 55% (1828/3322) Checking out files: 56% (1861/3322) Checking out files: 57% (1894/3322) Checking out files: 58% (1927/3322) Checking out files: 58% (1948/3322) Checking out files: 59% (1960/3322) Checking out files: 60% (1994/3322) Checking out files: 61% (2027/3322) Checking out files: 62% (2060/3322) Checking out files: 63% (2093/3322) Checking out files: 64% (2127/3322) Checking out files: 65% (2160/3322) Checking out files: 66% (2193/3322) Checking out files: 67% (2226/3322) Checking out files: 68% (2259/3322) Checking out files: 69% (2293/3322) Checking out files: 70% (2326/3322) Checking out files: 71% (2359/3322) Checking out files: 71% (2363/3322) Checking out files: 72% (2392/3322) Checking out files: 73% (2426/3322) Checking out files: 74% (2459/3322) Checking out files: 75% (2492/3322) Checking out files: 76% (2525/3322) Checking out files: 77% (2558/3322) Checking out files: 78% (2592/3322) Checking out files: 79% (2625/3322) Checking out files: 80% (2658/3322) Checking out files: 81% (2691/3322) Checking out files: 82% (2725/3322) Checking out files: 83% (2758/3322) Checking out files: 84% (2791/3322) Checking out files: 85% (2824/3322) Checking out files: 85% (2855/3322) Checking out files: 86% (2857/3322) Checking out files: 87% (2891/3322) Checking out files: 88% (2924/3322) Checking out files: 89% (2957/3322) Checking out files: 90% (2990/3322) Checking out files: 90% (3022/3322) Checking out files: 91% (3024/3322) Checking out files: 92% (3057/3322) Checking out files: 93% (3090/3322) Checking out files: 94% (3123/3322) Checking out files: 94% (3142/3322) Checking out files: 95% (3156/3322) Checking out files: 96% (3190/3322) Checking out files: 97% (3223/3322) Checking out files: 98% (3256/3322) Checking out files: 99% (3289/3322) Checking out files: 99% (3294/3322) Checking out files: 100% (3322/3322) Checking out files: 100% (3322/3322), 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: 0% (3/3392) Checking out files: 0% (20/3392) Checking out files: 1% (34/3392) Checking out files: 2% (68/3392) Checking out files: 3% (102/3392) Checking out files: 4% (136/3392) Checking out files: 5% (170/3392) Checking out files: 6% (204/3392) Checking out files: 7% (238/3392) Checking out files: 8% (272/3392) Checking out files: 9% (306/3392) Checking out files: 10% (340/3392) Checking out files: 11% (374/3392) Checking out files: 12% (408/3392) Checking out files: 12% (433/3392) Checking out files: 13% (441/3392) Checking out files: 14% (475/3392) Checking out files: 15% (509/3392) Checking out files: 16% (543/3392) Checking out files: 17% (577/3392) Checking out files: 18% (611/3392) Checking out files: 19% (645/3392) Checking out files: 20% (679/3392) Checking out files: 21% (713/3392) Checking out files: 21% (733/3392) Checking out files: 22% (747/3392) Checking out files: 22% (764/3392) Checking out files: 23% (781/3392) Checking out files: 24% (815/3392) Checking out files: 24% (847/3392) Checking out files: 25% (848/3392) Checking out files: 26% (882/3392) Checking out files: 27% (916/3392) Checking out files: 28% (950/3392) Checking out files: 29% (984/3392) Checking out files: 30% (1018/3392) Checking out files: 31% (1052/3392) Checking out files: 32% (1086/3392) Checking out files: 33% (1120/3392) Checking out files: 34% (1154/3392) Checking out files: 35% (1188/3392) Checking out files: 36% (1222/3392) Checking out files: 37% (1256/3392) Checking out files: 38% (1289/3392) Checking out files: 39% (1323/3392) Checking out files: 40% (1357/3392) Checking out files: 41% (1391/3392) Checking out files: 42% (1425/3392) Checking out files: 43% (1459/3392) Checking out files: 44% (1493/3392) Checking out files: 45% (1527/3392) Checking out files: 46% (1561/3392) Checking out files: 47% (1595/3392) Checking out files: 48% (1629/3392) Checking out files: 49% (1663/3392) Checking out files: 50% (1696/3392) Checking out files: 50% (1711/3392) Checking out files: 51% (1730/3392) Checking out files: 52% (1764/3392) Checking out files: 53% (1798/3392) Checking out files: 54% (1832/3392) Checking out files: 55% (1866/3392) Checking out files: 56% (1900/3392) Checking out files: 57% (1934/3392) Checking out files: 58% (1968/3392) Checking out files: 59% (2002/3392) Checking out files: 60% (2036/3392) Checking out files: 61% (2070/3392) Checking out files: 62% (2104/3392) Checking out files: 63% (2137/3392) Checking out files: 64% (2171/3392) Checking out files: 64% (2199/3392) Checking out files: 65% (2205/3392) Checking out files: 66% (2239/3392) Checking out files: 67% (2273/3392) Checking out files: 68% (2307/3392) Checking out files: 69% (2341/3392) Checking out files: 70% (2375/3392) Checking out files: 71% (2409/3392) Checking out files: 72% (2443/3392) Checking out files: 73% (2477/3392) Checking out files: 74% (2511/3392) Checking out files: 75% (2544/3392) Checking out files: 76% (2578/3392) Checking out files: 77% (2612/3392) Checking out files: 78% (2646/3392) Checking out files: 79% (2680/3392) Checking out files: 80% (2714/3392) Checking out files: 81% (2748/3392) Checking out files: 82% (2782/3392) Checking out files: 83% (2816/3392) Checking out files: 83% (2825/3392) Checking out files: 84% (2850/3392) Checking out files: 85% (2884/3392) Checking out files: 86% (2918/3392) Checking out files: 87% (2952/3392) Checking out files: 88% (2985/3392) Checking out files: 89% (3019/3392) Checking out files: 90% (3053/3392) Checking out files: 91% (3087/3392) Checking out files: 92% (3121/3392) Checking out files: 93% (3155/3392) Checking out files: 94% (3189/3392) Checking out files: 95% (3223/3392) Checking out files: 96% (3257/3392) Checking out files: 97% (3291/3392) Checking out files: 98% (3325/3392) Checking out files: 99% (3359/3392) Checking out files: 99% (3360/3392) Checking out files: 99% (3373/3392) Checking out files: 100% (3392/3392) Checking out files: 100% (3392/3392), done. Switched to branch "2.6.25-rc8-mc16" Already on "2.6.25-rc8-mc16" warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc16" 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: 1  remote: Counting objects: 11, done. remote: Compressing objects: 14% (1/7)  remote: Compressing objects: 28% (2/7)  remote: Compressing objects: 42% (3/7)  remote: Compressing objects: 5remote: 7% (4/7)  remote: Compressing objects: 71% (5/7)  remote: Compressing objects: 85% (6/7)  remote: Compressing objects: 100% (7/7)  remote: Compressingremote: objects: 100% (7/7), done. remote: Total 7 (delta 6), reused 0 (delta 0) From /pub/scm/linux/kernel/git/jwboyer/powerpc-4xx a07e387..81c7255 next -> powerpc-4xx warning: too many files, skipping inexact rename detection Already on "2.6.25-rc8-mc16" warning: too many files, skipping inexact rename detection Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1  remote: Counting objects: 11, done. remote: Compressing objects: 25% (1/4)  remote: Compressing objects: 50% (2/4)  remote: Compresremote: sing objects: 75% (3/4)  remote: Compressing objects: 100% (4/4)  remote: Compressing objects: 100% (4/4), done. remote: Total 6 (delta 5), reused remote: 3 (delta 2) From /pub/scm/linux/kernel/git/galak/powerpc 5f0f2a0..242e57d powerpc-next -> powerpc1git warning: too many files, skipping inexact rename detection warning: too many files, skipping inexact rename detection ged 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-git7 to 7180c4c9e09888db0a188f729c96c6d7bd61fa83 Using base 7180c4c9e09888db0a188f729c96c6d7bd61fa83 i2c-new-co-maintainer.patch i2c-ibm_iic-fast-mode-parm-desc-fixup.patch i2c-davinci-01-fix-lost-interrupt.patch i2c-tiny-usb-new-vid-pid-pair.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-bfin-twi-01-add-repeated-start.patch i2c-bfin-twi-02-support-multiport-controllers.patch i2c-bfin-twi-03-add-pin-mux-operation.patch i2c-bfin-twi-04-driver-description.patch i2c-bfin-twi-05-use-simpler-comment-headers.patch i2c-bfin-twi-06-add-ADSP-BF52x-support.patch i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch i2c-scx200_acb-dont-use-0-as-null-pointer.patch 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 | 1 + drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/isp1301_omap.c | 28 +- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-s