From /pub/scm/linux/kernel/git/torvalds/linux-2.6 4a72ef9..950b0d2 master -> linus Switched to branch "2.6.25-rc8-mc11" remote: Counting objects: 945, done. remote: Compressing objects: 1% (1/98)  remote: Compressing objects: 2% (2/98)  remote: Compressing objects: 3% (remote: 3/98)  remote: Compressing objects: 4% (4/98)  remote: Compressing objects: 5% (5/98)  remote: Compressing objects: 6% (6/98)  remote: Compressingremote: objects: 7% 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/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/scsi/qla2xxx/qla_sup.c | 315 ++++++-- drivers/scsi/qla2xxx/qla_version.h | 6 +- drivers/scsi/qla4xxx/ql4_fw.h | 4 +- drivers/scsi/qla4xxx/ql4_glbl.h | 4 + drivers/scsi/qla4xxx/ql4_iocb.c | 14 +- drivers/scsi/qla4xxx/ql4_isr.c | 40 +- drivers/scsi/qla4xxx/ql4_mbx.c | 39 + drivers/scsi/qla4xxx/ql4_os.c | 96 ++- drivers/scsi/raid_class.c | 2 +- drivers/scsi/scsi.c | 229 ++++-- drivers/scsi/scsi_debug.c | 1219 ++++++++++++--------------- drivers/scsi/scsi_debug.h | 24 - drivers/scsi/scsi_error.c | 150 +++- drivers/scsi/scsi_lib.c | 12 +- drivers/scsi/sgiwd93.c | 7 +- drivers/scsi/st.c | 83 ++- drivers/scsi/st.h | 3 + drivers/scsi/st_options.h | 6 +- drivers/scsi/stex.c | 83 +-- drivers/scsi/wd33c93.c | 3 - include/linux/attribute_container.h | 2 +- include/linux/mtio.h | 1 + include/linux/scatterlist.h | 5 + include/linux/transport_class.h | 5 +- include/scsi/libsas.h | 2 + include/scsi/sas_ata.h | 4 +- include/scsi/scsi_cmnd.h | 17 + include/scsi/scsi_eh.h | 5 +- include/scsi/scsi_host.h | 1 + lib/scatterlist.c | 102 +++ 112 files changed, 4429 insertions(+), 4019 deletions(-) create mode 100644 drivers/s390/scsi/zfcp_dbf.h delete mode 100644 drivers/scsi/scsi_debug.h ## # quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide noerror ## building file list ... done ./ alim15x3-skip-dma-initialization-completely-on-revs-lt-0x20.patch au1xxx-ide-fix-mwdma-support.patch au1xxx-ide-use-ide_find_port.patch au1xxx-ide-use-init_dma-method.patch bast-ide-fix-resources-reservation.patch cmd640-always-auto-tune-pio.patch cmd640-cleanup-setup_device_ptrs.patch cmd640-init-hwif-io_ports-irq-explicitly.patch cmd640-manage-io-resources-in-driver.patch cmd640-remove-cmd_drives.patch cmd640-use-ide_find_port.patch delkin_cb-fix-resources-handling.patch falconide-fix-resources-reservation-take-2.patch gayle-add-doubler-parameter.patch ht6560b-use-driver-name-for-resource-allocation.patch icside-use-init_dma-method.patch ide-4drives-manage-io-resources-in-driver.patch ide-acpi-add-missing-drive-acpidata-zeroing.patch ide-add-cdrom-and-chs-parameters.patch ide-add-config_ide_arch_obsolete_defaults-take-2.patch ide-add-generic-packet-command-representation-ide_atapi_pc.patch ide-add-ide-4drives-host-driver-take-3.patch ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch ide-add-ide_hflag_serialize_dma-host-flag.patch ide-add-ide_legacy_device_add-helper.patch ide-add-ide_legacy_init_one-helper.patch ide-add-ignore_cable-kernel-parameter-take-2.patch ide-add-noacpi-acpigtf-acpionboot-parameters.patch ide-add-nodma-noflush-noprobe-nowerr-parameters.patch ide-add-struct-ide_dma_ops-take-2.patch ide-add-struct-ide_io_ports.patch ide-add-struct-ide_port_ops-take-2.patch ide-add-vlb-pci_clock-parameter.patch ide-add-warm-plug-support-for-ide-devices-take-2.patch ide-add-warm-plug-support-for-ide-devices.patch ide-always-auto-tune-pio-in-legacy-vlb-host-drivers.patch ide-cd-fix-remaining-checkpatch-pl-issues.patch ide-cd-fixup-comments.patch ide-cd-include-proper-headers.patch ide-cd-put-all-proc-related-code-at-one-place.patch ide-cd-put-proc-related-functions-together-under-single-ifdef.patch ide-cd-remove-the-internal-64k-buffer.patch ide-cd-replace-__function__-with-__func__.patch ide-cd-shorten-lines-longer-than-80-columns.patch ide-cleanup-ide_find_port.patch ide-cleanup-ide_match_hwif.patch ide-cleanup-ide_setup_dma.patch ide-cleanup-init_ide_data.patch ide-cleanup-setting-hwif-mmio-flag.patch ide-coding-style-fixes-to-drivers_ide_ide-cd-c.patch ide-coding-style-fixes-to-drivers_ide_ide-floppy-c.patch ide-coding-style-fixes-to-drivers_ide_ide-pnp-c.patch ide-coding-style-fixes-to-drivers_ide_ide-proc-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_ali14xx-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_hd-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_ide-4drives-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_umc8672-c.patch ide-coding-style-fixes-to-drivers_ide_pci_cmd640-c.patch ide-coding-style-fixes-to-drivers_ide_pci_cy82c693-c.patch ide-coding-style-fixes-to-drivers_ide_pci_generic-c.patch ide-coding-style-fixes-to-drivers_ide_pci_it8213-c.patch ide-coding-style-fixes-to-drivers_ide_pci_jmicron-c.patch ide-coding-style-fixes-to-drivers_ide_pci_opti621-c.patch ide-coding-style-fixes-to-drivers_ide_pci_sis5513-c.patch ide-coding-style-fixes-to-drivers_ide_pci_slc90e66-c.patch ide-coding-style-fixes-to-drivers_ide_pci_tc86c001-c.patch ide-coding-style-fixes-to-drivers_ide_setup-pci-c.patch ide-constify-struct-ide_dma_ops.patch ide-cs-manage-io-resources-in-driver.patch ide-disk-add-proc_idedisk_read_smart-helper.patch ide-disk-fix-issues-found-by-checkpatch-pl.patch ide-do-complete-dma-setup-in-init_dma-method-take-2.patch ide-dont-display-bios-settings-in-ide_setup_dma.patch ide-export-ide_allocate_dma_engine.patch ide-factor-out-cable-detection-from-ide_init_port.patch ide-factor-out-devices-init-from-ide_init_port_data.patch ide-factor-out-setting-pci-bus-mastering-from-ide_hwif_setup_dma.patch ide-factor-out-unregistering-devices-from-ide_unregister.patch ide-fix-hwif-s-initialization.patch ide-fix-ide_find_port.patch ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-remove-struct-idefloppy_id_gcw.patch ide-floppy-rename-end_request-handler-properly.patch ide-generic-manage-io-resources-in-driver.patch ide-generic-set-hwif-chipset.patch ide-generic-use-ide_find_port-take-3.patch ide-ide_hflag_bootable-to-ide_hfSwitched to branch "ide" Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc8-mc11" Switched to branch "gregkh-driver" Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Switched to branch "2.6.25-rc8-mc11" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Switched to branch "gregkh-ldp" .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. .dotest/patch:58: trailing whitespace. obj-$(CONFIG_SLICOSS) += slicoss.o .dotest/patch:24450: space before tab in indent. ushort DramRomFn; // 14 Dram/Rom function warning: 2 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc11" error: branch 'agp' not found. Switched to branch "i2c" Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" From /pub/scm/linux/kernel/git/roland/infiniband + 9c72265...af3a120 for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. From /home/rmk/linux-2.6-arm 1035d60..4a72ef9 master -> arm www.linux-mips.org[0: 84.159.109.120]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips' not found. www.linux-mips.org[0: 84.159.109.120]: errno=Connection refused fatal: unable to connect a socket (Connection refused) error: branch 'mips-devel' not found. Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 970, done. remote: Compressing objects: 0% (1/160)  remote: Compressing objects: 1% (2/160)  remote: Compressing objects: 2%remote: (4/160)  remote: Compressing objects: 3% (5/160)  remote: Compressing objects: 4% (7/160)  remote: Compressing objects: 5% (8/160)  remote: Comprremote: essing objects: 6% (10/160)  remote: Compressing objects: 7% (12/160)  remote: Compressing objects: 8% (13/160)  remote: Compressing objectsremote: : 9% (15/160)  remote: Compressing objects: 10% (16/160)  remote: Compressing objects: 11% (18/160)  remote: Compressing objects: 12% (20/160remote: )  remote: Compressing objects: 13% (21/160)  remote: Compressing objects: 14% (23/160)  remote: Compressing objects: 15% (24/160)  remote: Compressiremote: ng objects: 16% (26/160)  remote: Compressing objects: 17% (28/160)  remote: Compressing objects: 18% (29/160)  remote: Compressing objects: 1remote: 9% (31/160)  remote: Compressing objects: 20% (32/160)  remote: Compressing objects: 21% (34/160)  remote: Compressing objects: 22% (36/160)  remote: remote: Compressing objects: 23% (37/160)  remote: Compressing objects: 24% (39/160)  remote: Compressing objects: 25% (40/160)  remote: Compressing oReceiving objects: 0% (1/902) Receiving objects: 1% (10/902) Receiving objects: 2% (19/902) Receiving objects: 3% (28/902) Receiving objects: 4% (37/902) Receiving objects: 5% (46/902) Receiving objects: 6% (55/902) Receiving objects: 7% (64/902) Receiving objects: 8% (73/902) remote: bjects: 26% (42/160)  remote: Compressing objects: 27% (44/160)  remote: Compressing objects: 28% (45/160)  remote: Compressing objects: 29% (remote: 47/160)  remote: Compressing objects: 30% (48/160)  remote: Compressing objects: 31% (50/160)  remote: Compressing objects: 32% (52/160)  remote: ComReceiving objects: 9% (82/902) Receiving objects: 10% (91/902) Receiving objects: 11% (100/902) Receiving objects: 12% (109/902) Receiving objects: 13% (118/902) Receiving objects: 14% (127/902) Receiving objects: 15% (136/902) Receiving objects: 16% (145/902) Receiving objects: 17% (154/902) Receiving objects: 18% (163/902) Receiving objects: 19% (172/902) Receiving objects: 20% (181/902) Receiving objects: 21% (190/902) Receiving objects: 22% (199/902) Receiving objects: 23% (208/902) Receiving objects: 24% (217/902) remote: pressing objects: 33% (53/160)  remote: Compressing objects: 34% (55/160)  remote: Compressing objects: 35% (56/160)  remote: Compressing objecremote: ts: 36% (58/160)  remote: Compressing objects: 37% (60/160)  remote: Compressing objects: 38% (61/160)  remote: Compressing objects: 39% (63/1remote: 60)  remote: Compressing objects: 40% (64/160)  remote: Compressing objects: 41% (66/160)  remote: Compressing objects: 42% (68/160)  remote: Compresremote: sing objects: 43% (69/160)  remote: Compressing objects: 44% (71/160)  remote: Compressing objects: 45% (72/160)  remote: Compressing objects: remote: 46% (74/160)  remote: Compressing objects: 47% (76/160)  remote: Compressing objects: 48% (77/160)  remote: Compressing objects: 49% (79/160) remote:  remote: Compressing objects: 50% (80/160)  remote: Compressing objects: 51% (82/160)  remote: Compressing objects: 52% (84/160)  remote: Compressingremote: objects: 53% (85/160)  remote: Compressing objects: 54% (87/160)  remote: Compressing objects: 55% (88/160)  remote: Compressing objects: 56%remote: (90/160)  remote: Compressing objects: 57% (92/160)  remote: Compressing objects: 58% (93/160)  remote: Compressing objects: 59% (95/160)  remote: Cremote: ompressing objects: 60% (96/160)  remote: Compressing objects: 61% (98/160)  remote: Compressing objects: 62% (100/160)  remote: Compressing obremote: jects: 63% (101/160)  remote: Compressing objects: 64% (103/160)  remote: Compressing objects: 65% (104/160)  remote: Compressing objects: 66%remote: (106/160)  remote: Compressing objects: 67% (108/160)  remote: Compressing objects: 68% (109/160)  remote: Compressing objects: 69% (111/160) remote:  remote: Compressing objects: 70% (112/160)  remote: Compressing objects: 71% (114/160)  remote: Compressing objects: 72% (116/160)  remote: Compressremote: ing objects: 73% (117/160)  remote: Compressing objects: 74% (119/160)  remote: Compressing objects: 75% (120/160)  remote: Compressing objectsremote: : 76% (122/160)  remote: Compressing objects: 77% (124/160)  remote: Compressing objects: 78% (125/160)  remote: Compressing objects: 79% (127remote: /160)  remote: Compressing objects: 80% (128/160)  remote: Compressing objects: 81% (130/160)  remote: Compressing objects: 82% (132/160)  remote: Coremote: mpressing objects: 83% (133/160)  remote: Compressing objects: 84% (135/160)  remote: Compressing objects: 85% (136/160)  remote: Compressing oremote: bjects: 86% (138/160)  remote: Compressing objects: 87% (140/160)  remote: Compressing objects: 88% (141/160)  remote: Compressing objects: 89remote: % (143/160)  remote: Compressing objects: 90% (144/160)  remote: Compressing objects: 91% (146/160)  remote: Compressing objects: 92% (148/160)remote:  remote: Compressing objects: 93% (149/160)  remote: Compressing objects: 94% (151/160)  remote: Compressing objects: 95% (152/160)  remote: Compresremote: sing objects: 96% (154/160)  remote: Compressing objects: 97% (156/160)  remote: Compressing objects: 98% (157/160)  remote: Compressing objectremote: s: 99% (159/160)  remote: Compressing objects: 100% (160/160)  remote: Compressing objects: 100% (160/160), done. remote: Total 902 (delta 741), reremote: used 902 (delta 741) Receiving objects: 25% (226/902) Receiving objects: 26% (235/902) Receiving objects: 27% (244/902) Receiving objects: 28% (253/902) Receiving objects: 29% (262/902) Receiving objects: 30% (271/902) Receiving objects: 31% (280/902) Receiving objects: 32% (289/902) Receiving objects: 33% (298/902) Receiving objects: 34% (307/902) Receiving objects: 35% (316/902) Receiving objects: 36% (325/902) Receiving objects: 37% (334/902) Receiving objects: 38% (343/902) Receiving objects: 39% (352/902) Receiving objects: 40% (361/902) Receiving objects: 41% (370/902) Receiving objects: 42% (379/902) Receiving objects: 43% (388/902) Receiving objects: 44% (397/902) Receiving objects: 45% (406/902) Receiving objects: 46% (415/902) Receiving objects: 47% (424/902) Receiving objects: 48% (433/902) Receiving objects: 49% (442/902) Receiving objects: 50% (451/902) Receiving objects: 51% (461/902) Receiving objects: 52% (470/902) Receiving objects: 53% (479/902) Receiving objects: 54% (488/902) Receiving objects: 55% (497/902) Receiving objects: 56% (506/902) Receiving objects: 57% (515/902) Receiving objects: 58% (524/902) Receiving objects: 59% (533/902) Receiving objects: 60% (542/902) Receiving objects: 61% (551/902) Receiving objects: 62% (560/902) Receiving objects: 63% (569/902) Receiving objects: 64% (578/902) Receiving objects: 65% (587/902) Receiving objects: 66% (596/902) Receiving objects: 67% (605/902) Receiving objects: 68% (614/902) Receiving objects: 69% (623/902) Receiving objects: 70% (632/902) Receiving objects: 71% (641/902) Receiving objects: 72% (650/902) Receiving objects: 73% (659/902) Receiving objects: 74% (668/902) Receiving objects: 75% (677/902) Receiving objects: 76% (686/902) Receiving objects: 77% (695/902) Receiving objects: 78% (704/902) Receiving objects: 79% (713/902) Receiving objects: 80% (722/902) Receiving objects: 81% (731/902) Receiving objects: 82% (740/902) Receiving objects: 83% (749/902) Receiving objects: 84% (758/902) Receiving objects: 85% (767/902) Receiving objects: 86% (776/902) Receiving objects: 87% (785/902) Receiving objects: 88% (794/902) Receiving objects: 89% (803/902) Receiving objects: 90% (812/902) Receiving objects: 91% (821/902) Receiving objects: 92% (830/902) Receiving objects: 93% (839/902) Receiving objects: 94% (848/902) Receiving objects: 95% (857/902) Receiving objects: 96% (866/902) Receiving objects: 97% (875/902) Receiving objects: 98% (884/902) Receiving objects: 99% (893/902) Receiving objects: 100% (902/902) Receiving objects: 100% (902/902), 151.98 KiB, done. Resolving deltas: 0% (1/741) Resolving deltas: 2% (21/741) Resolving deltas: 6% (45/741) Resolving deltas: 7% (57/741) Resolving deltas: 8% (65/741) Resolving deltas: 10% (80/741) Resolving deltas: 17% (127/741) Resolving deltas: 20% (149/741) Resolving deltas: 22% (164/741) Resolving deltas: 23% (174/741) Resolving deltas: 24% (182/741) Resolving deltas: 25% (192/741) Resolving deltas: 27% (202/741) Resolving deltas: 31% (230/741) Resolving deltas: 32% (240/741) Resolving deltas: 34% (254/741) Resolving deltas: 52% (391/741) Resolving deltas: 54% (402/741) Resolving deltas: 55% (414/741) Resolving deltas: 56% (415/741) Resolving deltas: 57% (424/741) Resolving deltas: 58% (430/741) Resolving deltas: 59% (438/741) Resolving deltas: 64% (477/741) Resolving deltas: 65% (482/741) Resolving deltas: 69% (517/741) Resolving deltas: 70% (519/741) Resolving deltas: 71% (527/741) Resolving deltas: 72% (537/741) Resolving deltas: 89% (664/741) Resolving deltas: 90% (667/741) Resolving deltas: 91% (677/741) Resolving deltas: 96% (712/741) Resolving deltas: 97% (719/741) Resolving deltas: 98% (728/741) Resolving deltas: 99% (736/741) Resolving deltas: 100% (741/741) Resolving deltas: 100% (741/741), completed with 68 local objects. From /pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel * [new branch] master -> sched Switched to branch "sched" Finished one revert. Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 8b1266f..cc1020f master -> watchdog remote: Counting objects: 6680, done. remote: Compressing objects: 0% (1/832)  remote: Compressing objects: 1% (9/832)  remote: Compressing objects: 2remote: % (17/832)  remote: Compressing objects: 3% (25/832)  remote: Compressing objects: 4% (34/832)  remote: Compressing objects: 5% (42/832)  remote: Compressing objects: 6% (50/832)  remote: Compressing objects: 7% (59/832)  remote: Compressing objects: 8% (67/832)  remote: Compressing obremote: jects: 9% (75/832)  remote: Compressing objects: 10% (84/832)  remote: Compressing objects: 11% (92/832)  remote: Compressing objects: 12% (1remote: 00/832)  remote: Compressing objects: 13% (109/832)  remote: Compressing objects: 14% (117/832)  remote: Compressing objects: 15% (125/832)  remote: Compressing objects: 16% (134/832)  remote: Compressing objects: 17% (142/832)  remote: Compressing objects: 18% (150/832)  remote: Compressingremote: objects: 19% (159/832)  remote: Compressing objects: 20% (167/832)  remote: Compressing objects: 21% (175/832)  remote: Compressing objects:  remote: 22% (184/832)  remote: Compressing objects: 23% (192/832)  remote: Compressing objects: 24% (200/832)  remote: Compressing objects: 25% (208/83remote: 2)  remote: Compressing objects: 26% (217/832)  remote: Compressing objects: 27% (225/832)  remote: Compressing objects: 28% (233/832)  remote: Comprremote: essing objects: 29% (242/832)  remote: Compressing objects: 30% (250/832)  remote: Compressing objects: 31% (258/832)  remote: Compressing objeremote: cts: 32% (267/832)  remote: Compressing objects: 33% (275/832)  remote: Compressing objects: 34% (283/832)  remote: Compressing objects: 35% (remote: 292/832)  remote: Compressing objects: 36% (300/832)  remote: Compressing objects: 37% (308/832)  remote: Compressing objects: 38% (317/832)  remote: remote: Compressing objects: 39% (325/832)  remote: Compressing objects: 40% (333/832)  remote: Compressing objects: 41% (342/832)  remote: CompressinReceiving objects: 0% (1/6107) Receiving objects: 1% (62/6107) Receiving objects: 2% (123/6107) Receiving objects: 3% (184/6107) remote: g objects: 42% (350/832)  remote: Compressing objects: 43% (358/832)  remote: Compressing objects: 44% (367/832)  remote: Compressing objects: remote: 45% (375/832)  remote: Compressing objects: 46% (383/832)  remote: Compressing objects: 47% (392/832)  remote: Compressing objects: 48% (400/8remote: 32)  remote: Compressing objects: 49% (408/832)  remote: Compressing objects: 50% (416/832)  remote: Compressing objects: 51% (425/832)  remote: Compremote: ressing objects: 52% (433/832)  remote: Compressing objects: 53% (441/832)  remote: Compressing objects: 54% (450/832)  remote: Compressing objremote: ects: 55% (458/832)  remote: Compressing objects: 56% (466/832)  remote: Compressing objects: 57% (475/832)  remote: Compressing objects: 58% remote: (483/832)  remote: Compressing objects: 59% (491/832)  remote: Compressing objects: 60% (500/832)  remote: Compressing objects: 61% (508/832)  Receiving objects: 4% (245/6107) Receiving objects: 5% (306/6107) Receiving objects: 6% (367/6107) Receiving objects: 7% (428/6107) remote:  remote: Compressing objects: 62% (516/832)  remote: Compressing objects: 63% (525/832)  remote: Compressing objects: 64% (533/832)  remote: Compressiremote: ng objects: 65% (541/832)  remote: Compressing objects: 66% (550/832)  remote: Compressing objects: 67% (558/832)  remote: Compressing objects:Receiving objects: 8% (489/6107) remote: 68% (566/832)  remote: Compressing objects: 69% (575/832)  remote: Compressing objects: 70% (583/832)  remote: Compressing objects: 71% (591/remote: 832)  remote: Compressing objects: 72% (600/832)  remote: Compressing objects: 73% (608/832)  remote: Compressing objects: 74% (616/832)  remote: ComReceiving objects: 9% (550/6107) remote: pressing objects: 75% (624/832)  remote: Compressing objects: 76% (633/832)  remote: Compressing objects: 77% (641/832)  remote: Compressing obremote: jects: 78% (649/832)  remote: Compressing objects: 79% (658/832)  remote: Compressing objects: 80% (666/832)  remote: Compressing objects: 81%remote: (674/832)  remote: Compressing objects: 82% (683/832)  remote: Compressing objects: 83% (691/832)  remote: Compressing objects: 84% (699/832) remote:  remote: Compressing objects: 85% (708/832)  remote: Compressing objects: 86% (716/832)  remote: Compressing objects: 87% (724/832)  remote: CompressReceiving objects: 10% (611/6107) remote: ing objects: 88% (733/832)  remote: Compressing objects: 89% (741/832)  remote: Compressing objects: 90% (749/832)  remote: Compressing objectsremote: : 91% (758/832)  remote: Compressing objects: 92% (766/832)  remote: Compressing objects: 93% (774/832)  remote: Compressing objects: 94% (783remote: /832)  remote: Compressing objects: 95% (791/832)  remote: Compressing objects: 96% (799/832)  remote: Compressing objects: 97% (808/832)  remote: Coremote: mpressing objects: 98% (816/832)  remote: Compressing objects: 99% (824/832)  remote: Compressing objects: 100% (832/832)  remote: Compressing oremote: bjects: 100% (832/832), done. Receiving objects: 11% (672/6107) Receiving objects: 12% (733/6107) Receiving objects: 13% (794/6107) Receiving objects: 14% (855/6107) Receiving objects: 15% (917/6107) Receiving objects: 16% (978/6107) Receiving objects: 17% (1039/6107) Receiving objects: 18% (1100/6107) Receiving objects: 19% (1161/6107) Receiving objects: 20% (1222/6107) Receiving objects: 21% (1283/6107) Receiving objects: 22% (1344/6107) Receiving objects: 23% (1405/6107) Receiving objects: 24% (1466/6107) Receiving objects: 25% (1527/6107) Receiving objects: 26% (1588/6107) Receiving objects: 27% (1649/6107) Receiving objects: 28% (1710/6107) Receiving objects: 29% (1772/6107) Receiving objects: 30% (1833/6107) Receiving objects: 31% (1894/6107) Receiving objects: 32% (1955/6107) Receiving objects: 33% (2016/6107) Receiving objects: 34% (2077/6107) Receiving objects: 35% (2138/6107) Receiving objects: 36% (2199/6107) Receiving objects: 37% (2260/6107) Receiving objects: 38% (2321/6107) Receiving objects: 39% (2382/6107) Receiving objects: 40% (2443/6107) Receiving objects: 41% (2504/6107) Receiving objects: 42% (2565/6107) Receiving objects: 43% (2627/6107) Receiving objects: 44% (2688/6107) Receiving objects: 45% (2749/6107) Receiving objects: 46% (2810/6107) Receiving objects: 47% (2871/6107) Receiving objects: 48% (2932/6107) Receiving objects: 49% (2993/6107) Receiving objects: 50% (3054/6107) Receiving objects: 51% (3115/6107) Receiving objects: 52% (3176/6107) Receiving objects: 53% (3237/6107) Receiving objects: 54% (3298/6107) Receiving objects: 55% (3359/6107) Receiving objects: 56% (3420/6107) Receiving objects: 57% (3481/6107) Receiving objects: 58% (3543/6107) Receiving objects: 59% (3604/6107) Receiving objects: 60% (3665/6107) Receiving objects: 61% (3726/6107) Receiving objects: 62% (3787/6107) Receiving objects: 63% (3848/6107) Receiving objects: 64% (3909/6107) Receiving objects: 65% (3970/6107) Receiving objects: 66% (4031/6107) Receiving objects: 67% (4092/6107) Receiving objects: 68% (4153/6107) Receiving objects: 69% (4214/6107) Receiving objects: 70% (4275/6107) Receiving objects: 71% (4336/6107) Receiving objects: 72% (4398/6107) Receiving objects: 73% (4459/6107) remote: Total 6107 (delta 5284), reused 6093 (delta 5270) Receiving objects: 74% (4520/6107) Receiving objects: 75% (4581/6107) Receiving objects: 76% (4642/6107) Receiving objects: 77% (4703/6107) Receiving objects: 78% (4764/6107) Receiving objects: 79% (4825/6107) Receiving objects: 80% (4886/6107) Receiving objects: 81% (4947/6107) Receiving objects: 82% (5008/6107) Receiving objects: 83% (5069/6107) Receiving objects: 84% (5130/6107) Receiving objects: 85% (5191/6107) Receiving objects: 86% (5253/6107) Receiving objects: 87% (5314/6107) Receiving objects: 88% (5375/6107) Receiving objects: 89% (5436/6107) Receiving objects: 90% (5497/6107) Receiving objects: 91% (5558/6107) Receiving objects: 92% (5619/6107) Receiving objects: 93% (5680/6107) Receiving objects: 94% (5741/6107) Receiving objects: 95% (5802/6107) Receiving objects: 96% (5863/6107) Receiving objects: 97% (5924/6107) Receiving objects: 98% (5985/6107) Receiving objects: 99% (6046/6107) Receiving objects: 100% (6107/6107) Receiving objects: 100% (6107/6107), 966.41 KiB, done. Resolving deltas: 0% (1/5284) Resolving deltas: 1% (69/5284) Resolving deltas: 2% (106/5284) Resolving deltas: 5% (312/5284) Resolving deltas: 7% (391/5284) Resolving deltas: 8% (438/5284) Resolving deltas: 9% (504/5284) Resolving deltas: 10% (577/5284) Resolving deltas: 11% (585/5284) Resolving deltas: 12% (649/5284) Resolving deltas: 13% (717/5284) Resolving deltas: 14% (740/5284) Resolving deltas: 15% (795/5284) Resolving deltas: 17% (948/5284) Resolving deltas: 18% (952/5284) Resolving deltas: 19% (1040/5284) Resolving deltas: 21% (1119/5284) Resolving deltas: 22% (1200/5284) Resolving deltas: 26% (1408/5284) Resolving deltas: 27% (1432/5284) Resolving deltas: 31% (1668/5284) Resolving deltas: 32% (1693/5284) Resolving deltas: 35% (1893/5284) Resolving deltas: 36% (1945/5284) Resolving deltas: 43% (2304/5284) Resolving deltas: 44% (2326/5284) Resolving deltas: 54% (2893/5284) Resolving deltas: 55% (2907/5284) Resolving deltas: 56% (2960/5284) Resolving deltas: 57% (3029/5284) Resolving deltas: 58% (3070/5284) Resolving deltas: 59% (3119/5284) Resolving deltas: 60% (3174/5284) Resolving deltas: 61% (3226/5284) Resolving deltas: 62% (3299/5284) Resolving deltas: 63% (3337/5284) Resolving deltas: 64% (3382/5284) Resolving deltas: 65% (3444/5284) Resolving deltas: 66% (3489/5284) Resolving deltas: 67% (3544/5284) Resolving deltas: 68% (3600/5284) Resolving deltas: 69% (3646/5284) Resolving deltas: 76% (4044/5284) Resolving deltas: 77% (4071/5284) Resolving deltas: 78% (4122/5284) Resolving deltas: 79% (4176/5284) Resolving deltas: 80% (4236/5284) Resolving deltas: 81% (4290/5284) Resolving deltas: 82% (4333/5284) Resolving deltas: 83% (4387/5284) Resolving deltas: 84% (4439/5284) Resolving deltas: 85% (4494/5284) Resolving deltas: 86% (4592/5284) Resolving deltas: 87% (4632/5284) Resolving deltas: 88% (4667/5284) Resolving deltas: 89% (4710/5284) Resolving deltas: 91% (4820/5284) Resolving deltas: 94% (5001/5284) Resolving deltas: 95% (5061/5284) Resolving deltas: 96% (5101/5284) Resolving deltas: 97% (5134/5284) Resolving deltas: 99% (5279/5284) Resolving deltas: 100% (5284/5284) Resolving deltas: 100% (5284/5284), completed with 541 local objects. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + 3e879c0...2ca86b2 master -> x86 (forced update) Switched to branch "x86" Finished one revert. Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. fatal: Not a valid object name: '2.6.25-rc8'. Switched to branch "doc" Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Switched to branch "m68k" .dotest/patch:353: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:382: space before tab in indent. m68k Macintosh. Support >16bit I/O spaces .dotest/patch:404: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use .dotest/patch:426: trailing whitespace. * transfer - some PC's will use the I/O bus, m68k's must use warning: 4 lines add whitespace errors. .dotest/patch:868: space before tab in indent. break; .dotest/patch:870: space before tab in indent. } while (--poll_count); .dotest/patch:875: space before tab in indent. if (!poll_count) { .dotest/patch:880: space before tab in indent. } else { .dotest/patch:1631: space before tab in indent. shouldn't this be a given if we have it here ? */ warning: squelched 6 whitespace errors warning: 11 lines add whitespace errors. Switched to branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. From /pub/scm/linux/kernel/git/jwboyer/powerpc-4xx 93173ce..a07e387 next -> powerpc-4xx Already on branch "2.6.25-rc8-mc11" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1533, done. remote: Compressing objects: 0% (1/244)  remote: Compressing objects: 1% (3/244)  remote: Compressing objects: 2% (5/244)  remote: Compressing objecremote: ts: 3% (8/244)  remote: Compressing objects: 4% (10/244)  remote: Compressing objects: 5% (13/244)  remote: Compressing objects: 6% (15/244)  remote: Compressing objects: 7% (18/244)  remote: Compressing objects: 8% (20/244)  remote: Compressing objects: 9% (22/244)  remote: Compressing objects: 10% (25/244)  remote: Compressing objects: 11% (27/244)  remote: Compressing objects: 12% (30/244)  remote: Compressing objects: 13% (32/244)  remote: Compressing objects: 14% (35/244)  remote: Compressing objects: 15% (37/244)  remote: Compressing objects: 16% (40/244)  remote: Compressing objects: 17% (42/244)  remote: Compressing objects: 18% (44/244)  remote: Compressing objects: 19% (47/244)  remote: Compressing objects: 20% (49/244)  remote: Compressing objects: 21% (52/244)  remote: Compressing objects: 22% (54/244)  remote: Compressing objects: 23% (57/244)  remote: Compressing objects: 24% (59/244)  remote: Compressing objects: 25% (61/244)  remote: Compressing objects: 26% (64/244)  remote: Compressing objects: 27% (66/244)  remote: Compressing objects: 28% (69/244)  remote: Compressing objects: 29% (71/244)  remote: Compressing objects: 30% (74/244)  remote: Compressing objects: 31% (76/244)  remote: Compressing objects: 32% (79/244)  remote: Compressing objects: 33% (81/244)  remote: Compressing objects: 34% (83/244)  remote: Compressing objects: 35% (86/244)  remote: Compressing objects: 36% (88/244)  remote: Compressing objects: 37% (91/244)  remote: Compressing objects: 38% (93/244)  remote: Compressing objects: 39% (96/244)  remote: Compressing objects: 40% (98/244)  remote: Compressing objects: 41% (101/244)  remote: Compressing objects: 42% (103/244)  remote: Compressing objects: 43% (105/244)  remote: Compressing objects: 44% (108/244)  remote: Compressing objects: 45% (110/244)  remote: Compressing objects: 46% (113/244)  remote: Compressing objects: 47% (115/244)  remote: Compressing objects: 48% (118/244)  remote: Compressing objects: 49% (120/244)  remote: Compressing objects: 50% (122/244)  remote: Compressing objects: 51% (125/244)  remote: Compressing objects: 52% (127/244)  remote: Compressing objects: 53% (130/244)  remote: Compressing objects: 54% (132/244)  remote: Compressing objects: 55% (135/244)  remote: Compressing objects: 56% (137/244)  remote: Compressing objects: 57% (140/244)  remote: Compressing objects: 58% (142/244)  remote: Compressing objects: 59% (144/244)  remote: Compressing objects: 60% (147/244)  remote: Compressing objects: 61% (149/244)  remote: Compressing objects: 62% (152/244)  remote: Compressing objects: 63% (154/244)  remote: Compressing objects: 64% (157/244)  remote: Compressing objects: 65% (159/244)  remote: Compressing objects: 66% (162/244)  remote: Compressing objects: 67% (164/244)  remote: Compressing objects: 68% (166/244)  remote: Compressing objects: 69% (169/244)  remote: Compressing objects: 70% (171/244)  remote: Compressing objects: 71% (174/244)  remote: Compressing objects: 72% (176/244)  remote: Compressing objects: 73% (179/244)  remote: Compressing objects: 74% (181/244)  remote: Compressing objects: 75% (183/244)  remote: Compressing objects: 76% (186/244)  remote: Compressing objects: 77% (188/244)  remote: Compressing objects: 78% (191/244)  remote: Compressing objects: 79% (193/244)  remote: Compressing objects: 80% (196/244)  remote: Compressing objects: 81% (198/244)  remote: Compressing objects: 82% (201/244)  remote: Compressing objects: 83% (203/244)  remote: Compressing objects: 84% (205/244)  remote: Compressing objects: 85% (208/244)  remote: Compressing objects: 86% (210/244)  remote: Compressing objects: 87% (213/244)  remote: Compressing objects: 88% (215/244)  remote: Compressing objects: 89% (218/244)  remote: Compressing objects: 90% (220/244)  remote: Compressing objects: 91% (223/244)  remote: Compressing objects: 92% (225/244)  remote: Compressing objects: 93% (227/244)  remote: Compressing objects: 94% (230/244)  remote: Compressing objects: 95% (232/244)  remote: Compressing objects: 96% (235/244)  remote: Compressing objects: 97% (237/244)  remote: Compressing objects: 98% (240/244)  remote: Compressing objects: 99% (242/244)  remote: Compressing objects: 100% (244/244)  remote: Compressing objects: 100% (244/244), done. Receiving objects: 0% (1/1241) Receiving objects: 1% (13/1241) Receiving objects: 2% (25/1241) Receiving objects: 3% (38/1241) Receiving objects: 4% (50/1241) Receiving objects: 5% (63/1241) Receiving objects: 6% (75/1241) Receiving objects: 7% (87/1241) Receiving objects: 8% (100/1241) Receiving objects: 9% (112/1241) Receiving objects: 10% (125/1241) Receiving objects: 11% (137/1241) Receiving objects: 12% (149/1241) Receiving objects: 13% (162/1241) Receiving objects: 14% (174/1241) Receiving objects: 15% (187/1241) Receiving objects: 16% (199/1241) Receiving objects: 17% (211/1241) Receiving objects: 18% (224/1241) Receiving objects: 19% (236/1241) Receiving objects: 20% (249/1241) Receiving objects: 21% (261/1241) Receiving objects: 22% (274/1241) Receiving objects: 23% (286/1241) Receiving objects: 24% (298/1241) Receiving objects: 25% (311/1241) Receiving objects: 26% (323/1241) Receiving objects: 27% (336/1241) Receiving objects: 28% (348/1241) Receiving objects: 29% (360/1241) Receiving objects: 30% (373/1241) Receiving objects: 31% (385/1241) Receiving objects: 32% (398/1241) Receiving objects: 33% (410/1241) Receiving objects: 34% (422/1241) Receiving objects: 35% (435/1241) Receiving objects: 36% (447/1241) Receiving objects: 37% (460/1241) Receiving objects: 38% (472/1241) remote: Total 1241 (delta 1062), reused 1167 (delta 997) Receiving objects: 39% (484/1241) Receiving objects: 40% (497/1241) Receiving objects: 41% (509/1241) Receiving objects: 42% (522/1241) Receiving objects: 43% (534/1241) Receiving objects: 44% (547/1241) Receiving objects: 45% (559/1241) Receiving objects: 46% (571/1241) Receiving objects: 47% (584/1241) Receiving objects: 48% (596/1241) Receiving objects: 49% (609/1241) Receiving objects: 50% (621/1241) Receiving objects: 51% (633/1241) Receiving objects: 52% (646/1241) Receiving objects: 53% (658/1241) Receiving objects: 54% (671/1241) Receiving objects: 55% (683/1241) Receiving objects: 56% (695/1241) Receiving objects: 57% (708/1241) Receiving objects: 58% (720/1241) Receiving objects: 59% (733/1241) Receiving objects: 60% (745/1241) Receiving objects: 61% (758/1241) Receiving objects: 62% (770/1241) Receiving objects: 63% (782/1241) Receiving objects: 64% (795/1241) Receiving objects: 65% (807/1241) Receiving objects: 66% (820/1241) Receiving objects: 67% (832/1241) Receiving objects: 68% (844/1241) Receiving objects: 69% (857/1241) Receiving objects: 70% (869/1241) Receiving objects: 71% (882/1241) Receiving objects: 72% (894/1241) Receiving objects: 73% (906/1241) Receiving objects: 74% (919/1241) Receiving objects: 75% (931/1241) Receiving objects: 76% (944/1241) Receiving objects: 77% (956/1241) Receiving objects: 78% (968/1241) Receiving objects: 79% (981/1241) Receiving objects: 80% (993/1241) Receiving objects: 81% (1006/1241) Receiving objects: 82% (1018/1241) Receiving objects: 83% (1031/1241) Receiving objects: 84% (1043/1241) Receiving objects: 85% (1055/1241) Receiving objects: 86% (1068/1241) Receiving objects: 87% (1080/1241) Receiving objects: 88% (1093/1241) Receiving objects: 89% (1105/1241) Receiving objects: 90% (1117/1241) Receiving objects: 91% (1130/1241) Receiving objects: 92% (1142/1241) Receiving objects: 93% (1155/1241) Receiving objects: 94% (1167/1241) Receiving objects: 95% (1179/1241) Receiving objects: 96% (1192/1241) Receiving objects: 97% (1204/1241) Receiving objects: 98% (1217/1241) Receiving objects: 99% (1229/1241) Receiving objects: 100% (1241/1241) Receiving objects: 100% (1241/1241), 400.84 KiB, done. Resolving deltas: 0% (4/1062) Resolving deltas: 1% (11/1062) Resolving deltas: 2% (22/1062) Resolving deltas: 3% (32/1062) Resolving deltas: 4% (47/1062) Resolving deltas: 5% (54/1062) Resolving deltas: 6% (69/1062) Resolving deltas: 7% (75/1062) Resolving deltas: 8% (85/1062) Resolving deltas: 22% (243/1062) Resolving deltas: 23% (247/1062) Resolving deltas: 24% (255/1062) Resolving deltas: 35% (382/1062) Resolving deltas: 36% (384/1062) Resolving deltas: 37% (395/1062) Resolving deltas: 38% (405/1062) Resolving deltas: 39% (415/1062) Resolving deltas: 40% (425/1062) Resolving deltas: 41% (436/1062) Resolving deltas: 42% (447/1062) Resolving deltas: 43% (457/1062) Resolving deltas: 45% (482/1062) Resolving deltas: 47% (506/1062) Resolving deltas: 48% (514/1062) Resolving deltas: 49% (523/1062) Resolving deltas: 50% (533/1062) Resolving deltas: 51% (547/1062) Resolving deltas: 52% (553/1062) Resolving deltas: 53% (563/1062) Resolving deltas: 54% (574/1062) Resolving deltas: 55% (585/1062) Resolving deltas: 56% (598/1062) Resolving deltas: 57% (607/1062) Resolving deltas: 58% (616/1062) Resolving deltas: 59% (627/1062) Resolving deltas: 60% (638/1062) Resolving deltas: 61% (653/1062) Resolving deltas: 62% (659/1062) Resolving deltas: 63% (670/1062) Resolving deltas: 64% (681/1062) Resolving deltas: 65% (699/1062) Resolving deltas: 66% (701/1062) Resolving deltas: 67% (713/1062) Resolving deltas: 69% (738/1062) Resolving deltas: 70% (744/1062) Resolving deltas: 71% (756/1062) Resolving deltas: 72% (765/1062) Resolving deltas: 73% (776/1062) Resolving deltas: 74% (786/1062) Resolving deltas: 75% (799/1062) Resolving deltas: 76% (815/1062) Resolving deltas: 77% (820/1062) Resolving deltas: 78% (830/1062) Resolving deltas: 79% (845/1062) Resolving deltas: 80% (851/1062) Resolving deltas: 81% (863/1062) Resolving deltas: 82% (872/1062) Resolving deltas: 83% (891/1062) Resolving deltas: 84% (896/1062) Resolving deltas: 92% (979/1062) Resolving deltas: 93% (988/1062) Resolving deltas: 94% (1002/1062) Resolving deltas: 95% (1009/1062) Resolving deltas: 96% (1020/1062) Resolving deltas: 98% (1043/1062) Resolving deltas: 99% (1060/1062) Resolving deltas: 100% (1062/1062) Resolving deltas: 100% (1062/1062), completed with 275 local objects. From /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 + ad9870f...e060039 master -> scsi-postmerge (forced update) | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 113 files changed, 2715 insertions(+), 2901 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # merge gregkh-driver ## Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/base/transport_class.c Auto-merged drivers/message/fusion/mptscsih.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/3w-xxxx.c Auto-merged drivers/scsi/aacraid/aachba.c Auto-merged drivers/scsi/ch.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/hptiop.c Auto-merged drivers/scsi/qla2xxx/qla_attr.c Auto-merged drivers/scsi/qla2xxx/qla_gbl.h Auto-merged drivers/scsi/raid_class.c Auto-merged drivers/scsi/st.c Auto-merged include/linux/attribute_container.h Auto-merged include/linux/libata.h Auto-merged include/linux/transport_class.h Auto-merged include/scsi/scsi_host.h Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 5 - Documentation/power/devices.txt | 5 + MAINTAINERS | 5 + arch/arm/Kconfig | 2 + block/bsg.c | 11 +- drivers/ata/ahci.c | 4 +- drivers/ata/libata-scsi.c | 15 +- drivers/base/attribute_container.c | 77 ++-- drivers/base/base.h | 11 - drivers/base/bus.c | 17 +- drivers/base/class.c | 640 +------------------- drivers/base/core.c | 30 +- drivers/base/cpu.c | 4 +- drivers/base/dd.c | 14 +- drivers/base/firmware_class.c | 18 +- drivers/base/memory.c | 33 +- drivers/base/power/main.c | 66 +-- drivers/base/power/power.h | 23 +- drivers/base/power/sysfs.c | 2 + drivers/base/sys.c | 18 +- drivers/base/transport_class.c | 14 +- drivers/char/drm/drmP.h | 1 - drivers/infiniband/core/sysfs.c | 76 ++-- drivers/infiniband/core/ucm.c | 62 +- drivers/infiniband/core/user_mad.c | 109 ++-- drivers/infiniband/core/uverbs.h | 4 +- drivers/infiniband/core/uverbs_main.c | 51 +- drivers/infiniband/hw/amso1100/c2_provider.c | 48 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 75 ++-- drivers/infiniband/hw/ipath/ipath_diag.c | 10 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 44 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 8 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 37 +- drivers/infiniband/hw/mlx4/main.c | 49 +- drivers/infiniband/hw/mthca/mthca_provider.c | 48 +- drivers/infiniband/hw/nes/nes_verbs.c | 48 +- drivers/infiniband/ulp/srp/ib_srp.c | 181 +++--- drivers/infiniband/ulp/srp/ib_srp.h | 4 +- drivers/memstick/core/memstick.c | 33 +- drivers/memstick/core/mspro_block.c | 4 +- drivers/memstick/host/jmb38x_ms.c | 16 +- drivers/message/fusion/mptscsih.c | 122 ++-- drivers/message/fusion/mptscsih.h | 2 +- drivers/misc/enclosure.c | 118 ++-- drivers/net/phy/phy_device.c | 8 +- drivers/scsi/3w-9xxx.c | 9 +- drivers/scsi/3w-xxxx.c | 9 +- drivers/scsi/aacraid/aachba.c | 2 +- drivers/scsi/aacraid/aacraid.h | 4 +- drivers/scsi/aacraid/linit.c | 93 ++-- drivers/scsi/arcmsr/arcmsr.h | 4 +- drivers/scsi/arcmsr/arcmsr_attr.c | 163 +++-- drivers/scsi/ch.c | 13 +- drivers/scsi/hosts.c | 34 +- drivers/scsi/hptiop.c | 14 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 44 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 25 +- drivers/scsi/ipr.c | 140 +++-- drivers/scsi/lpfc/lpfc_attr.c | 484 ++++++++------- drivers/scsi/lpfc/lpfc_crtn.h | 4 +- drivers/scsi/megaraid/megaraid_mbox.c | 13 +- drivers/scsi/ncr53c8xx.c | 7 +- drivers/scsi/osst.c | 76 ++-- drivers/scsi/pcmcia/sym53c500_cs.c | 14 +- drivers/scsi/qla2xxx/qla_attr.c | 177 +++--- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/raid_class.c | 73 ++-- drivers/scsi/scsi_sas_internal.h | 24 +- drivers/scsi/scsi_sysfs.c | 150 +++-- drivers/scsi/scsi_transport_fc.c | 385 +++++++------ drivers/scsi/scsi_transport_iscsi.c | 107 ++-- drivers/scsi/scsi_transport_sas.c | 157 +++--- drivers/scsi/scsi_transport_spi.c | 185 +++--- drivers/scsi/scsi_transport_srp.c | 26 +- drivers/scsi/sd.c | 78 ++- drivers/scsi/ses.c | 28 +- drivers/scsi/sg.c | 36 +- drivers/scsi/st.c | 71 ++- drivers/serial/serial_core.c | 2 +- drivers/uio/Kconfig | 23 +- drivers/uio/Makefile | 1 + drivers/uio/uio_cif.c | 6 +- drivers/uio/uio_smx.c | 140 +++++ fs/partitions/check.c | 4 + fs/sysfs/dir.c | 1 + fs/sysfs/file.c | 1 + include/linux/attribute_container.h | 28 +- include/linux/bsg.h | 2 +- include/linux/device.h | 118 +---- include/linux/enclosure.h | 11 +- include/linux/init.h | 1 + include/linux/kernel.h | 6 +- include/linux/libata.h | 2 +- include/linux/memory.h | 5 +- include/linux/memstick.h | 2 +- include/linux/pm.h | 43 +-- include/linux/pm_wakeup.h | 90 +++ include/linux/raid_class.h | 12 +- include/linux/sysfs.h | 9 +- include/linux/transport_class.h | 6 +- include/rdma/ib_verbs.h | 2 +- include/scsi/scsi_device.h | 10 +- include/scsi/scsi_host.h | 7 +- include/scsi/scsi_transport.h | 2 +- include/scsi/scsi_transport_fc.h | 14 +- include/scsi/scsi_transport_sas.h | 12 +- include/scsi/sd.h | 4 +- init/main.c | 9 + lib/kobject.c | 71 ++- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 ++- 113 files changed, 2715 insertions(+), 2901 deletions(-) create mode 100644 drivers/uio/uio_smx.c create mode 100644 include/linux/pm_wakeup.h rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-generic-pci_enable_resources.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-add-pci-express-aspm-support.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-clean-up-resource-alignment-management.patch pci-clean-up-search.c-a-lot.patch pci-cris-use-generic-pci_enable_resources.patch pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-expose-pci-vpd-through-sysfs.patch pci-frv-use-generic-pci_enable_resources.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-ia64-use-generic-pci_enable_resources.patch pci-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-iommu-iotlb-flushing.patch pci-iova-rb-tree-setup-tweak.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-update-via-cx700-quirk.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch series sent 449395 bytes received 1038 bytes 900866.00 bytes/sec total size is 444040 speedup is 0.99 Using base gregkh-driver pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch pci-update-via-cx700-quirk.patch pci-aerdrv_acpi.c-remove-unneeded-null-check.patch pci-clean-up-resource-alignment-management.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c CONFLICT (content): Merge conflict in drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit 94bf234: Resolve Patch: /home/jejb/gregkh-pci-fixup.diff ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch ub-drop-bug-and-update-small-things.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-usb-serial-spcp8x5-driver.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-ftdi_sio-note-missing-locking.patch usb-g_printer-bugfixes.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-increase-cdc-acm-write-throughput.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-serial-remove-obsolete-contact-addresses.patch usb-serial-sierra-c597-fix.patch usb-serial-sierra-clean-up.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-usb.h-reduce-syslog-clutter.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-use-div_round_up.patch usbmon-restore-mmap.patch sent 1160498 bytes received 1764 bytes 2324524.00 bytes/sec total size is 1150941 speedup is 0.99 Using base gregkh-pci usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-cypress_m8-speed-handling.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch usb-usb.h-reduce-syslog-clutter.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch ub-drop-bug-and-update-small-things.patch usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-serial-sierra-clean-up.patch usb-serial-sierra-c597-fix.patch usb-add-usb-serial-spcp8x5-driver.patch u132-hcd-fix-checkpatch-style-issues.patch u132-hdc-semaphore-to-mutex.patch usb-fix-comments-of-2-functions-in-hcd.c.patch usb-serial-remove-obsolete-contact-addresses.patch usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch usb-g_printer-bugfixes.patch usb-usb-storage-use-adaptive-dma-mask.patch usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- Documentation/usb/usb-serial.txt | 7 +- drivers/block/ub.c | 76 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.c | 2 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 10 +- drivers/usb/core/quirks.c | 14 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/amd5536udc.c | 10 + drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 28 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 18 +- drivers/usb/gadget/lh7a40x_udc.c | 132 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 92 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 1 - drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 10 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 5139 ++++++++++++------------- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 20 +- drivers/usb/misc/adutux.c | 120 +- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 +- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 +- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 +- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++-- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 +- drivers/usb/serial/garmin_gps.c | 112 +- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 +- drivers/usb/serial/io_ti.c | 392 +- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 +- drivers/usb/serial/keyspan.c | 262 +- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 +- drivers/usb/serial/mos7840.c | 159 +- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 +- drivers/usb/serial/pl2303.c | 112 +- drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 83 +- drivers/usb/serial/spcp8x5.c | 1075 ++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +- drivers/usb/serial/usb-serial.c | 89 +- drivers/usb/serial/visor.c | 92 +- drivers/usb/serial/whiteheat.c | 110 +- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 + drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 26 +- drivers/usb/storage/transport.c | 23 +- drivers/usb/storage/unusual_devs.h | 8 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 5 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 1 + 160 files changed, 7288 insertions(+), 5819 deletions(-) create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-ldp/. gregkh-ldp base gregkh-usb ## building file list ... done ./ README add-me4000-pci-data-collection-driver.patch aectc-add-the-aectc-driver.patch dvb-add-firesat-driver.patch input-add-appleir-driver.patch net-add-alacritech-slicoss-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch series usb-add-sensoray-2255-v4l-driver.patch video-add-the-go7007-driver.patch sent 7494770 bytes received 246 bytes 4996677.33 bytes/sec total size is 7492758 speedup is 1.00 Using base gregkh-usb usb-add-sensoray-2255-v4l-driver.patch dvb-add-firesat-driver.patch video-add-the-go7007-driver.patch net-add-alacritech-slicoss-driver.patch input-add-appleir-driver.patch add-me4000-pci-data-collection-driver.patch novfs-add-the-novell-filesystem-client-kernel-module.patch ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## BRANCH agp-patches not in tree /pub/scm/linux/kernel/git/airlied/agp-2.6.git, SKIPPING ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/usb/gadget/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 302 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/Kconfig | 4 +- drivers/usb/gadget/atmel_usba_udc.c | 156 ++++++++--------- drivers/usb/gadget/atmel_usba_udc.h | 9 + include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/intc.h | 128 -------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 28 files changed, 1305 insertions(+), 766 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/CHANGES | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/powerpc/kernel/process.c Auto-merged arch/powerpc/kernel/rtas_flash.c Auto-merged arch/powerpc/kernel/setup_32.c Auto-merged arch/powerpc/oprofile/cell/vma_map.c Auto-merged arch/powerpc/platforms/powermac/setup.c Auto-merged arch/powerpc/platforms/pseries/pci_dlpar.c Auto-merged arch/powerpc/sysdev/cpm2.c Auto-merged arch/ppc/platforms/radstone_ppc7d.c Merge made by recursive. Documentation/kernel-parameters.txt | 2 + Documentation/powerpc/booting-without-of.txt | 16 - Documentation/powerpc/phyp-assisted-dump.txt | 127 +++ arch/powerpc/Kconfig | 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 | 7 + 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 | 53 +- 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 | 583 ++++++- drivers/media/video/cx88/cx88-core.c | 13 +- drivers/media/video/cx88/cx88-dvb.c | 245 +++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 9 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 63 +- drivers/media/video/cx88/cx88.h | 14 +- drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 4 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 26 +- drivers/media/video/ivtv/ivtv-cards.c | 7 +- drivers/media/video/ivtv/ivtv-cards.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 44 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-queue.c | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 14 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 7 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 844 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/ov511.c | 2 + drivers/media/video/pms.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 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 | 985 +++++++++++ drivers/media/video/saa5249.c | 2 + drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 4 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/Kconfig | 1 + drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 366 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 418 ++++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 20 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 6 +- drivers/media/video/sn9c102/sn9c102_core.c | 12 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 5 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 6 +- drivers/media/video/stv680.c | 11 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 861 ++++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 57 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 8 +- drivers/media/video/usbvideo/vicam.c | 2 + drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 168 ++- drivers/media/video/videobuf-dma-sg.c | 137 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 49 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vivi.c | 334 ++--- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 6 +- drivers/media/video/w9968cf.c | 4 +- drivers/media/video/zc0301/zc0301_core.c | 4 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_card.h | 2 + drivers/media/video/zoran_device.c | 12 +- drivers/media/video/zoran_driver.c | 4 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 55 +- include/media/ir-common.h | 1 + include/media/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 9 +- include/media/videobuf-dma-sg.h | 14 +- 255 files changed, 10889 insertions(+), 3572 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-git3 to e315c121a858499d84dc88c499046b9f10bb61ec Using base e315c121a858499d84dc88c499046b9f10bb61ec i2c-new-co-maintainer.patch i2c-ibm_iic-fast-mode-parm-desc-fixup.patch i2c-davinci-01-fix-lost-interrupt.patch i2c-tiny-usb-new-vid-pid-pair.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-bfin-twi-01-add-repeated-start.patch i2c-bfin-twi-02-support-multiport-controllers.patch i2c-bfin-twi-03-add-pin-mux-operation.patch i2c-bfin-twi-04-driver-description.patch i2c-bfin-twi-05-use-simpler-comment-headers.patch i2c-bfin-twi-06-add-ADSP-BF52x-support.patch i2c-bfin-twi-07-fix-mismatch-in-add-timer-and-delete-timer.patch i2c-scx200_acb-dont-use-0-as-null-pointer.patch i2c-superh-mobile-i2c-bus-controller-v5.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-bfin-twi.c | 474 +++++++++++++++++---------- drivers/i2c/busses/i2c-davinci.c | 23 +- drivers/i2c/busses/i2c-ibm_iic.c | 199 +++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-sh_mobile.c | 500 ++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-tiny-usb.c | 12 +- drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/isp1301_omap.c | 28 +- drivers/i2c/i2c-core.c | 2 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + 25 files changed, 2301 insertions(+), 590 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 drivers/i2c/busses/i2c-sh_mobile.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 6 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 24 +++- drivers/hid/usbhid/Kconfig | 8 + drivers/hid/usbhid/Makefile | 3 + drivers/hid/usbhid/hid-core.c | 65 +++++---- drivers/hid/usbhid/hid-ff.c | 3 + drivers/hid/usbhid/hid-lg2ff.c | 114 ++++++++++++++++ drivers/hid/usbhid/hid-quirks.c | 55 ++++++++- drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- drivers/hid/usbhid/usbhid.h | 3 +- include/linux/hid.h | 14 ++- 12 files changed, 407 insertions(+), 176 deletions(-) create mode 100644 drivers/hid/usbhid/hid-lg2ff.c ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 10 + drivers/input/input-polldev.c | 6 +- drivers/input/joystick/xpad.c | 211 ++++++- drivers/input/keyboard/locomokbd.c | 73 ++- drivers/input/keyboard/tosakbd.c | 21 +- drivers/input/touchscreen/Kconfig | 53 ++ drivers/input/touchscreen/Makefile | 7 + drivers/input/touchscreen/ads7846.c | 22 +- drivers/input/touchscreen/mainstone-wm97xx.c | 302 ++++++++++ drivers/input/touchscreen/usbtouchscreen.c | 31 +- drivers/input/touchscreen/wm9705.c | 353 ++++++++++++ drivers/input/touchscreen/wm9712.c | 462 +++++++++++++++ drivers/input/touchscreen/wm9713.c | 460 +++++++++++++++ drivers/input/touchscreen/wm97xx-core.c | 789 ++++++++++++++++++++++++++ include/linux/input.h | 8 +- include/linux/spi/ads7846.h | 3 +- include/linux/wm97xx.h | 311 ++++++++++ 17 files changed, 3036 insertions(+), 86 deletions(-) create mode 100644 drivers/input/touchscreen/mainstone-wm97xx.c create mode 100644 drivers/input/touchscreen/wm9705.c create mode 100644 drivers/input/touchscreen/wm9712.c create mode 100644 drivers/input/touchscreen/wm9713.c create mode 100644 drivers/input/touchscreen/wm97xx-core.c create mode 100644 include/linux/wm97xx.h ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Auto-merged MAINTAINERS Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. Documentation/ia64/kvm.txt | 82 ++ Documentation/ioctl-number.txt | 2 + Documentation/s390/kvm.txt | 125 +++ MAINTAINERS | 10 + arch/ia64/Kconfig | 3 + arch/ia64/Makefile | 1 + arch/ia64/kernel/mca.c | 49 + arch/ia64/kernel/mca_asm.S | 5 + arch/ia64/kernel/smp.c | 82 ++ arch/ia64/kvm/Kconfig | 46 + arch/ia64/kvm/Makefile | 61 + arch/ia64/kvm/asm-offsets.c | 251 +++++ arch/ia64/kvm/kvm-ia64.c | 1789 ++++++++++++++++++++++++++++++ arch/ia64/kvm/kvm_fw.c | 500 +++++++++ arch/ia64/kvm/kvm_minstate.h | 273 +++++ arch/ia64/kvm/lapic.h | 25 + arch/ia64/kvm/misc.h | 93 ++ arch/ia64/kvm/mmio.c | 341 ++++++ arch/ia64/kvm/optvfault.S | 918 ++++++++++++++++ arch/ia64/kvm/process.c | 970 +++++++++++++++++ arch/ia64/kvm/trampoline.S | 1038 ++++++++++++++++++ arch/ia64/kvm/vcpu.c | 2163 +++++++++++++++++++++++++++++++++++++ arch/ia64/kvm/vcpu.h | 740 +++++++++++++ arch/ia64/kvm/vmm.c | 66 ++ arch/ia64/kvm/vmm_ivt.S | 1424 ++++++++++++++++++++++++ arch/ia64/kvm/vti.h | 290 +++++ arch/ia64/kvm/vtlb.c | 636 +++++++++++ arch/ia64/mm/tlb.c | 198 ++++ arch/s390/Kconfig | 14 + arch/s390/Makefile | 2 +- arch/s390/kernel/early.c | 4 + arch/s390/kernel/setup.c | 14 +- arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Kconfig | 43 + arch/s390/kvm/Makefile | 14 + arch/s390/kvm/diag.c | 67 ++ arch/s390/kvm/gaccess.h | 274 +++++ arch/s390/kvm/intercept.c | 216 ++++ arch/s390/kvm/interrupt.c | 583 ++++++++++ arch/s390/kvm/kvm-s390.c | 673 ++++++++++++ arch/s390/kvm/kvm-s390.h | 64 ++ arch/s390/kvm/priv.c | 323 ++++++ arch/s390/kvm/sie64a.S | 47 + arch/s390/kvm/sigp.c | 288 +++++ arch/s390/lib/uaccess_pt.c | 3 + arch/s390/mm/pgtable.c | 65 ++- arch/x86/Kconfig | 19 + arch/x86/kernel/Makefile | 2 + arch/x86/kernel/crash.c | 3 +- arch/x86/kernel/kvm.c | 247 +++++ arch/x86/kernel/kvmclock.c | 187 ++++ arch/x86/kernel/reboot.c | 13 +- arch/x86/kernel/setup_32.c | 6 + arch/x86/kernel/setup_64.c | 7 + arch/x86/kvm/Kconfig | 2 +- arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c |