Switched to branch "2.6.25-rc6-mc13" remote: Counting objects: 350, done. remote: Compressing objects: 2% (1/41)  remote: Compressing objects: 4% (2/41)  remote: Compressing objects: 7% (3/41)  remote: Compressing objects: 9% (4/41)  remote: Compressing objects: 12% (5/41)  remote: Compressing objects: 14% (6/41)  remote: Compressing objects:remote: 17% (7/41)  remote: Compressing objects: 19% (8/41)  remote: Compressing objects: 21% (9/41)  rRemoved drivers/scsi/scsi_debug.h Merge made by recursive. Documentation/scsi/st.txt | 12 +- arch/ia64/hp/sim/simscsi.c | 23 +- drivers/base/transport_class.c | 2 +- drivers/message/fusion/mptbase.c | 27 +- drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptscsih.c | 8 +- drivers/s390/scsi/zfcp_def.h | 1 - drivers/s390/scsi/zfcp_fsf.c | 7 + drivers/s390/scsi/zfcp_scsi.c | 64 +-- drivers/scsi/3w-9xxx.c | 21 +- drivers/scsi/3w-xxxx.c | 12 +- drivers/scsi/BusLogic.c | 5 +- drivers/scsi/BusLogic.h | 21 +- drivers/scsi/FlashPoint.c | 6 +- drivers/scsi/Kconfig | 14 +- drivers/scsi/aacraid/aachba.c | 67 ++-- drivers/scsi/aic7xxx/aic79xx_osm.c | 7 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +- drivers/scsi/aic94xx/aic94xx.h | 16 - drivers/scsi/aic94xx/aic94xx_hwi.c | 20 +- drivers/scsi/aic94xx/aic94xx_init.c | 2 - drivers/scsi/arm/acornscsi.c | 1 - drivers/scsi/arm/cumana_1.c | 1 - drivers/scsi/dc395x.c | 1 - drivers/scsi/eata_pio.c | 2 - drivers/scsi/gdth.c | 320 ++++++--------- drivers/scsi/gdth.h | 2 - drivers/scsi/hptiop.c | 1 - drivers/scsi/ips.c | 49 +-- drivers/scsi/libsas/sas_scsi_host.c | 41 ++ drivers/scsi/mac_scsi.c | 1 - drivers/scsi/ps3rom.c | 94 +---- drivers/scsi/qla4xxx/ql4_fw.h | 1 + drivers/scsi/qla4xxx/ql4_glbl.h | 2 + drivers/scsi/qla4xxx/ql4_mbx.c | 39 ++ drivers/scsi/qla4xxx/ql4_os.c | 82 +++- drivers/scsi/raid_class.c | 2 +- drivers/scsi/scsi.c | 227 ++++++++--- drivers/scsi/scsi_debug.c | 755 +++++++++++++++-------------------- drivers/scsi/scsi_debug.h | 24 -- drivers/scsi/scsi_error.c | 122 +++++- drivers/scsi/st.c | 83 ++++- drivers/scsi/st.h | 3 + drivers/scsi/st_options.h | 6 +- drivers/scsi/stex.c | 66 +--- include/linux/attribute_container.h | 2 +- include/linux/mtio.h | 1 + include/linux/scatterlist.h | 5 + include/linux/transport_class.h | 4 +- include/scsi/libsas.h | 2 + include/scsi/scsi_cmnd.h | 17 + include/scsi/scsi_eh.h | 1 + include/scsi/scsi_host.h | 1 + lib/scatterlist.c | 102 +++++ 54 files changed, 1259 insertions(+), 1150 deletions(-) delete mode 100644 drivers/scsi/scsi_debug.h ## # quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## building file list ... done ./ 0001-Revert-ide-tape-schedule-driver-for-removal-after.patch 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-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 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-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.patch ide-add-struct-ide_dma_ops-take-2.patch ide-add-struct-ide_port_ops-take-2.patch ide-add-warm-plug-support-for-ide-devices-take-2.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-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-documentation_ide_ide-txt-fixes.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-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_hflag_non_bootable.patch ide-init-hwif-io_ports-irq-explicitly-in-legacy-vlb-host-drivers.patch ide-limit-legacy-vlb-host-drivers-to-alpha-x86-and-mips.patch ide-manage-io-resources-in-ide_legacy_init_one.patch ide-manage-resources-for-pci-devices-in-ide_pci_enable-take-2.patch ide-mark-hdx-driver_name-and-hdx-scsi-kernel-parameters-as-obsoleted.patch ide-mark-hdx-remap-and-hdx-remap63-kernel-parameters-as-obsoleted.patch ide-mark-special-ide0-kernel-parameters-as-obsoleted.patch ide-merge-ide_match_hwif-and-ide_find_port.patch ide-move-default-ide-ports-setup-toSwitched to branch "ide" Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-driver" Switched to branch "2.6.25-rc6-mc13" Switched to branch "gregkh-driver" Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Finished one revert. Switched to branch "2.6.25-rc6-mc13" Switched to branch "gregkh-pci" .dotest/patch:167: space before tab in indent. dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name); warning: 1 line adds whitespace errors. Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "gregkh-usb" .dotest/patch:32: space before tab in indent. for (j = 0; j < N_IN_URB; j++) { .dotest/patch:33: space before tab in indent. portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL); .dotest/patch:34: space before tab in indent. if (!portdata->in_buffer[j]) { .dotest/patch:35: space before tab in indent. for ( --j; j >= 0; j--) .dotest/patch:36: space before tab in indent. kfree(portdata->in_buffer[j]); warning: squelched 4 whitespace errors warning: 9 lines add whitespace errors. .dotest/patch:225: space before tab in indent. */ warning: 1 line adds whitespace errors. .dotest/patch:2601: space before tab in indent. dbg(1," %s : file is NULL", __func__); .dotest/patch:2609: space before tab in indent. dbg(1," %s : object is NULL", __func__); .dotest/patch:8366: space before tab in indent. dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); .dotest/patch:8741: space before tab in indent. dbg ("%s - Update complete 0x%x", __func__, status); .dotest/patch:8805: space before tab in indent. dbg ("%s - Error downloading operational code image", __func__); warning: squelched 5 whitespace errors warning: 10 lines add whitespace errors. Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" From /pub/scm/linux/kernel/git/sfrench/cifs-2.6 8b1327f..d2532dd master -> cifs Switched to branch "i2c" Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" remote: Counting objects: 60, done. remote: Compressing objects: 2% (1/47)  remote: Compressing objects: 4% (2/47)  remote: Compressing objects: 6% (3/47)  remote: Compressing objects: 8% (4/47)  remote: Compressing objects: 10% (5/47)  remote: Compressing objects: 12% (6/47)  remote: Compressing objects: 14% (7/47)  remote: Compressing objects: 17% (8/47)  remote: Compressing objects: 19% (9/47)  remote: Compressing objects: 21% (10/47)  remote: Compressing objects: 23% (11/47)  remote: Compressing objects: 25% (12/47)  remote: Compressing objects: 27% (13/47)  remote: Compressing objects: 29% (14/47)  remote: Compressing objects: 31% (15/47)  remote: Compressing objecremote: ts: 34% (16/47)  remote: Compressing objects: 36% (17/47)  remote: Compressing objects: 38% (18/47)  remote: Compressing objects: 40% (19/47) remote:  remote: Compressing objects: 42% (20/47)  remote: Compressing objects: 44% (21/47)  remote: Compressing objects: 46% (22/47)  remote: Compressing obremote: jects: 48% (23/47)  remote: Compressing objects: 51% (24/47)  remote: Compressing objects: 53% (25/47)  remote: Compressing objects: 55% (26/4remote: 7)  remote: Compressing objects: 57% (27/47)  remote: Compressing objects: 59% (28/47)  remote: Compressing objects: 61% (29/47)  remote: Compressingremote: objects: 63% (30/47)  remote: Compressing objects: 65% (31/47)  remote: Compressing objects: 68% (32/47)  remote: Compressing objects: 70% (3remote: 3/47)  remote: Compressing objects: 72% (34/47)  remote: Compressing objects: 74% (35/47)  remote: Compressing objects: 76% (36/47)  remote: Compressremote: ing objects: 78% (37/47)  remote: Compressing objects: 80% (38/47)  remote: Compressing objects: 82% (39/47)  remote: Compressing objects: 85%remote: (40/47)  remote: Compressing objects: 87% (41/47)  remote: Compressing objects: 89% (42/47)  remote: Compressing objects: 91% (43/47)  remote: Comprremote: essing objects: 93% (44/47)  remote: Compressing objects: 95% (45/47)  remote: Compressing objects: 97% (46/47)  remote: Compressing objects: 1remote: 00% (47/47)  remote: Compressing objects: 100% (47/47), done. remote: Total 47 (delta 40), reused 0 (delta 0) From /pub/scm/linux/kernel/git/jikos/hid 6b66c60..84d53fd upstream -> hid-upstream error: branch 'libata-upstream' not found. From /pub/scm/linux/kernel/git/roland/infiniband + 741dd88b...0f9d8de for-2.6.26 -> infiniband (forced update) Switched to branch "infiniband" Finished one revert. Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1  remote: Counting objects: 20  remote: Counting objects: 979  remote: Counting objects: 4622, done. remote: Compressing objects: 0% (1/1202)  remote: Compressing objects: 1% (13/1202)  remote: Compressing objects: 2% (25/1202)  remote: Compressing objects: 3% (37/1202)  remote: Compressing objects: 4% (49/1202)  remote: Compressing objects: 5% (61/1202)  remote: Compressing objects: 6% (73/1202)  remote: Compressing objects: 7% (85/1202)  remote: Compressing objects: 8% (97/1202)  remote: Compressing objects: 9% (109/1202)  remote: Compressing objects: 10% (121/1202)  remote: Compressing objects: 11% (133/1202)  remote: Compressing objects: 12% (145/1202)  remote: Compressing objects: 12% (148/1202)  remote: Compressing objects: 13% (157/1202)  remote: Compressing objects: 14% (169/1202)  remote: Compressing objects: 15% (181/1202)  remote: Compressing objects: 16% (193/1202)  remote: Compressing objects: 17% (205/1202)  remote: Compressing objects: 17% (213/1202)  remote: Compressing objects: 18% (217/1202)  remote: Compressing objects: 19% (229/1202)  remote: Compressing objects: 20% (241/1202)  remote: Compressing objects: 21% (253/1202)  remote: Compressing objects: 22% (265/1202)  remote: Compressing objects: 22% (275/1202)  remote: Compressing objects: 23% (277/1202)  remote: Compressing objects: 24% (289/1202)  remote: Compressing objects: 25% (301/1202)  remote: Compressing objects: 26% (313/1202)  remote: Compressing objects: 27% (325/1202)  remote: Compressing objects: 28% (337/1202)  remote: Compressing objects: 29% (349/1202)  remote: Compressing objects: 29% (354/1202)  remote: Compressing objects: 30% (361/1202)  remote: Compressing objects: 31% (373/1202)  remote: Compressing objects: 32% (385/1202)  remote: Compressing objects: 33% (397/1202)  remote: Compressing objects: 34% (409/1202)  remote: Compressing objects: 35% (421/1202)  remote: Compressing objects: 36% (433/1202)  remote: Compressing objects: 37% (445/1202)  remote: Compressing objects: 38% (457/1202)  remote: Compressing objects: 39% (469/1202)  remote: Compressing objects: 40% (481/1202)  remote: Compressing objects: 41% (493/1202)  remote: Compressing objects: 42% (505/1202)  remote: Compressing objects: 43% (517/1202)  remote: Compressing objects: 44% (529/1202)  remote: Compressing objects: 45% (541/1202)  remote: Compressing objects: 46% (553/1202)  remote: Compressing objects: 47% (565/1202)  remote: Compressing objects: 48% (577/1202)  remote: Compressing objects: 49% (589/1202)  remote: Compressing objects: 50% (601/1202)  remote: Compressing objects: 51% (614/1202)  remote: Compressing objects: 52% (626/1202)  remote: Compressing objects: 53% (638/1202)  remote: Compressing objects: 54% (650/1202)  remote: Compressing objects: 55% (662/1202)  remote: Compressing objects: 56% (674/1202)  remote: Compressing objects: 57% (686/1202)  remote: Compressing objects: 58% (698/1202)  remote: Compressing objects: 59% (710/1202)  remote: Compressing objects: 60% (722/1202)  remote: Compressing objects: 61% (734/1202)  remote: Compressing objects: 62% (746/1202)  remote: Compressing objects: 63% (758/1202)  remote: Compressing objects: 64% (770/1202)  remote: Compressing objects: 65% (782/1202)  remote: Compressing objects: 66% (794/1202)  remote: Compressing objects: 67% (806/1202)  remote: Compressing objects: 68% (818/1202)  remote: Compressing objects: 69% (830/1202)  remote: Compressing objects: 70% (842/1202)  remote: Compressing objects: 71% (854/1202)  remote: Compressing objects: 72% (866/1202)  remote: Compressing objects: 73% (878/1202)  remote: Compressing objects: 74% (890/1202)  remote: Compressing objects: 75% (902/1202)  remote: Compressing objects: 76% (914/1202)  remote: Compressing objects: 77% (926/1202)  remote: Compressing objects: 78% (938/1202)  remote: Compressing objects: 79% (950/1202)  remote: Compressing objects: 80% (962/1202)  remote: Compressing objects: 81% (974/1202)  remote: Compressing objects: 82% (986/1202)  remote: Compressing objects: 83% (998/1202)  remote: Compressing objects: 84% (1010/1202)  remote: Compressing objects: 85% (1022/1202)  remote: Compressing objects: 86% (1034/1202)  remote: Compressing objects: 87% (1046/1202)  remote: Compressing objects: 88% (1058/1202)  remote: Compressing objects: 89% (1070/1202)  remote: Compressing objects: 90% (1082/1202)  remote: Compressing objects: 91% (1094/1202)  remote: Compressing objects: 92% (1106/1202)  remote: Compressing objects: 93% (1118/1202)  remote: Compressing objects: 94% (1130/1202)  remote: Compressing objects: 95% (1142/1202)  remote: Compressing objects: 96% (1154/1202)  remote: Compressing objects: 97% (1166/1202)  remote: Compressing objects: 98% (1178/1202)  remote: Compressing objects: 99% (1190/1202)  remote: Compressing objects: 100% (1202/1202)  remote: Compressing objects: 100% (1202/1202), done. Receiving objects: 0% (1/4015) Receiving objects: 1% (41/4015) Receiving objects: 2% (81/4015) Receiving objects: 3% (121/4015) Receiving objects: 4% (161/4015) Receiving objects: 5% (201/4015) Receiving objects: 6% (241/4015) Receiving objects: 7% (282/4015) Receiving objects: 8% (322/4015) Receiving objects: 9% (362/4015) Receiving objects: 10% (402/4015) Receiving objects: 11% (442/4015) Receiving objects: 12% (482/4015) Receiving objects: 13% (522/4015) Receiving objects: 14% (563/4015) Receiving objects: 15% (603/4015) Receiving objects: 16% (643/4015), 371.99 KiB | 728 KiB/s Receiving objects: 17% (683/4015), 371.99 KiB | 728 KiB/s Receiving objects: 18% (723/4015), 371.99 KiB | 728 KiB/s Receiving objects: 19% (763/4015), 371.99 KiB | 728 KiB/s Receiving objects: 20% (803/4015), 371.99 KiB | 728 KiB/s Receiving objects: 21% (844/4015), 371.99 KiB | 728 KiB/s Receiving objects: 22% (884/4015), 371.99 KiB | 728 KiB/s Receiving objects: 23% (924/4015), 371.99 KiB | 728 KiB/s Receiving objects: 24% (964/4015), 371.99 KiB | 728 KiB/s Receiving objects: 25% (1004/4015), 371.99 KiB | 728 KiB/s Receiving objects: 25% (1016/4015), 699.99 KiB | 683 KiB/s Receiving objects: 26% (1044/4015), 699.99 KiB | 683 KiB/s Receiving objects: 27% (1085/4015), 699.99 KiB | 683 KiB/s Receiving objects: 28% (1125/4015), 699.99 KiB | 683 KiB/s Receiving objects: 29% (1165/4015), 699.99 KiB | 683 KiB/s Receiving objects: 30% (1205/4015), 699.99 KiB | 683 KiB/s Receiving objects: 31% (1245/4015), 699.99 KiB | 683 KiB/s Receiving objects: 32% (1285/4015), 699.99 KiB | 683 KiB/s Receiving objects: 33% (1325/4015), 699.99 KiB | 683 KiB/s Receiving objects: 34% (1366/4015), 699.99 KiB | 683 KiB/s Receiving objects: 35% (1406/4015), 699.99 KiB | 683 KiB/s Receiving objects: 36% (1446/4015), 699.99 KiB | 683 KiB/s Receiving objects: 37% (1486/4015), 699.99 KiB | 683 KiB/s Receiving objects: 38% (1526/4015), 699.99 KiB | 683 KiB/s Receiving objects: 39% (1566/4015), 699.99 KiB | 683 KiB/s Receiving objects: 40% (1606/4015), 699.99 KiB | 683 KiB/s Receiving objects: 41% (1647/4015), 699.99 KiB | 683 KiB/s Receiving objects: 42% (1687/4015), 699.99 KiB | 683 KiB/s Receiving objects: 43% (1727/4015), 699.99 KiB | 683 KiB/s Receiving objects: 44% (1767/4015), 699.99 KiB | 683 KiB/s Receiving objects: 45% (1807/4015), 699.99 KiB | 683 KiB/s Receiving objects: 46% (1847/4015), 699.99 KiB | 683 KiB/s Receiving objects: 47% (1888/4015), 699.99 KiB | 683 KiB/s Receiving objects: 48% (1928/4015), 699.99 KiB | 683 KiB/s Receiving objects: 49% (1968/4015), 699.99 KiB | 683 KiB/s Receiving objects: 50% (2008/4015), 699.99 KiB | 683 KiB/s Receiving objects: 51% (2048/4015), 699.99 KiB | 683 KiB/s Receiving objects: 52% (2088/4015), 699.99 KiB | 683 KiB/s Receiving objects: 53% (2128/4015), 699.99 KiB | 683 KiB/s Receiving objects: 54% (2169/4015), 699.99 KiB | 683 KiB/s Receiving objects: 55% (2209/4015), 699.99 KiB | 683 KiB/s Receiving objects: 56% (2249/4015), 699.99 KiB | 683 KiB/s Receiving objects: 57% (2289/4015), 699.99 KiB | 683 KiB/s Receiving objects: 58% (2329/4015), 699.99 KiB | 683 KiB/s Receiving objects: 59% (2369/4015), 699.99 KiB | 683 KiB/s Receiving objects: 60% (2409/4015), 699.99 KiB | 683 KiB/s Receiving objects: 61% (2450/4015), 699.99 KiB | 683 KiB/s Receiving objects: 62% (2490/4015), 699.99 KiB | 683 KiB/s Receiving objects: 63% (2530/4015), 699.99 KiB | 683 KiB/s Receiving objects: 64% (2570/4015), 699.99 KiB | 683 KiB/s Receiving objects: 65% (2610/4015), 699.99 KiB | 683 KiB/s Receiving objects: 66% (2650/4015), 699.99 KiB | 683 KiB/s Receiving objects: 67% (2691/4015), 699.99 KiB | 683 KiB/s Receiving objects: 68% (2731/4015), 699.99 KiB | 683 KiB/s Receiving objects: 69% (2771/4015), 699.99 KiB | 683 KiB/s Receiving objects: 70% (2811/4015), 699.99 KiB | 683 KiB/s Receiving objects: 71% (2851/4015), 699.99 KiB | 683 KiB/s Receiving objects: 72% (2891/4015), 699.99 KiB | 683 KiB/s Receiving objects: 73% (2931/4015), 699.99 KiB | 683 KiB/s Receiving objects: 74% (2972/4015), 699.99 KiB | 683 KiB/s Receiving objects: 75% (3012/4015), 699.99 KiB | 683 KiB/s Receiving objects: 76% (3052/4015), 699.99 KiB | 683 KiB/s Receiving objects: 77% (3092/4015), 699.99 KiB | 683 KiB/s Receiving objects: 78% (3132/4015), 699.99 KiB | 683 KiB/s Receiving objects: 79% (3172/4015), 699.99 KiB | 683 KiB/s Receiving objects: 80% (3212/4015), 699.99 KiB | 683 KiB/s Receiving objects: 81% (3253/4015), 699.99 KiB | 683 KiB/s Receiving objects: 82% (3293/4015), 699.99 KiB | 683 KiB/s Receiving objects: 83% (3333/4015), 699.99 KiB | 683 KiB/s Receiving objects: 84% (3373/4015), 699.99 KiB | 683 KiB/s Receiving objects: 85% (3413/4015), 699.99 KiB | 683 KiB/s Receiving objects: 86% (3453/4015), 699.99 KiB | 683 KiB/s Receiving objects: 87% (3494/4015), 699.99 KiB | 683 KiB/s Receiving objects: 88% (3534/4015), 699.99 KiB | 683 KiB/s Receiving objects: 89% (3574/4015), 699.99 KiB | 683 KiB/s Receiving objects: 90% (3614/4015), 699.99 KiB | 683 KiB/s Receiving objects: 91% (3654/4015), 699.99 KiB | 683 KiB/s Receiving objects: 92% (3694/4015), 699.99 KiB | 683 KiB/s Receiving objects: 93% (3734/4015), 699.99 KiB | 683 KiB/s Receiving objects: 94% (3775/4015), 699.99 KiB | 683 KiB/s Receiving objects: 95% (3815/4015), 699.99 KiB | 683 KiB/s Receiving objects: 96% (3855/4015), 699.99 KiB | 683 KiB/s Receiving objects: 97% (3895/4015), 699.99 KiB | 683 KiB/s Receiving objects: 98% (3935/4015), 699.99 KiB | 683 KiB/s Receiving objects: 99% (3975/4015), 699.99 KiB | 683 KiB/s Receiving objects: 100% (4015/4015), 699.99 KiB | 683 KiB/s Receiving objects: 100% (4015/4015), 1.27 MiB | 683 KiB/s, done. Resolving deltas: 0% (4/3464) Resolving deltas: 1% (48/3464) Resolving deltas: 2% (70/3464) Resolving deltas: 3% (120/3464) Resolving deltas: 4% (142/3464) remote: Total 4015 (delta 3464), reused 3301 (delta 2812) Resolving deltas: 5% (175/3464) Resolving deltas: 7% (276/3464) Resolving deltas: 8% (278/3464) Resolving deltas: 9% (312/3464) Resolving deltas: 15% (527/3464) Resolving deltas: 17% (599/3464) Resolving deltas: 19% (659/3464) Resolving deltas: 25% (876/3464) Resolving deltas: 27% (940/3464) Resolving deltas: 28% (974/3464) Resolving deltas: 29% (1006/3464) Resolving deltas: 30% (1041/3464) Resolving deltas: 34% (1209/3464) Resolving deltas: 35% (1213/3464) Resolving deltas: 36% (1248/3464) Resolving deltas: 37% (1282/3464) Resolving deltas: 37% (1304/3464) Resolving deltas: 38% (1320/3464) Resolving deltas: 39% (1368/3464) Resolving deltas: 40% (1399/3464) Resolving deltas: 41% (1447/3464) Resolving deltas: 42% (1459/3464) Resolving deltas: 42% (1489/3464) Resolving deltas: 43% (1491/3464) Resolving deltas: 44% (1526/3464) Resolving deltas: 45% (1564/3464) Resolving deltas: 46% (1599/3464) Resolving deltas: 47% (1634/3464) Resolving deltas: 48% (1663/3464) Resolving deltas: 48% (1681/3464) Resolving deltas: 49% (1705/3464) Resolving deltas: 50% (1732/3464) Resolving deltas: 52% (1812/3464) Resolving deltas: 53% (1843/3464) Resolving deltas: 54% (1873/3464) Resolving deltas: 59% (2056/3464) Resolving deltas: 60% (2080/3464) Resolving deltas: 62% (2160/3464) Resolving deltas: 63% (2184/3464) Resolving deltas: 63% (2203/3464) Resolving deltas: 64% (2217/3464) Resolving deltas: 65% (2252/3464) Resolving deltas: 66% (2288/3464) Resolving deltas: 67% (2325/3464) Resolving deltas: 67% (2337/3464) Resolving deltas: 68% (2357/3464) Resolving deltas: 69% (2392/3464) Resolving deltas: 70% (2425/3464) Resolving deltas: 71% (2462/3464) Resolving deltas: 72% (2510/3464) Resolving deltas: 73% (2530/3464) Resolving deltas: 73% (2555/3464) Resolving deltas: 74% (2564/3464) Resolving deltas: 75% (2602/3464) Resolving deltas: 76% (2636/3464) Resolving deltas: 77% (2668/3464) Resolving deltas: 78% (2709/3464) Resolving deltas: 78% (2733/3464) Resolving deltas: 79% (2737/3464) Resolving deltas: 80% (2778/3464) Resolving deltas: 81% (2815/3464) Resolving deltas: 84% (2923/3464) Resolving deltas: 90% (3123/3464) Resolving deltas: 91% (3153/3464) Resolving deltas: 92% (3214/3464) Resolving deltas: 93% (3225/3464) Resolving deltas: 96% (3339/3464) Resolving deltas: 97% (3383/3464) Resolving deltas: 98% (3411/3464) Resolving deltas: 99% (3449/3464) Resolving deltas: 100% (3464/3464) Resolving deltas: 100% (3464/3464), completed with 468 local objects. From /pub/scm/linux/kernel/git/davem/net-2.6.26 ec3c098..d5706ef master -> net Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 1  remote: Counting objects: 586, done. remote: Compressing objects: 0% (1/131)  remote: Compressing objects: 1% (2/131)  remote: Compressing objects: 2% (3/131)  remote: Compressing objecremote: ts: 3% (4/131)  remote: Compressing objects: 4% (6/131)  remote: Compressing objects: 5% (7/131)  remote: Compressing objects: 6% (8/131) remote:  remote: Compressing objects: 7% (10/131)  remote: Compressing objects: 8% (11/131)  remote: Compressing objects: 9% (12/131)  remote: Compressingremote: objects: 10% (14/131)  remote: Compressing objects: 11% (15/131)  remote: Compressing objects: 12% (16/131)  remote: Compressing objects: 13% (18/131)  remote: Compressing objects: 14% (19/131)  remote: Compressing objects: 15% (20/131)  remote: Compressing objects: 16% (21/131)  remote: Compressing objects: 17% (23/131)  remote: Compressing objects: 18% (24/131)  remote: Compressing objects: 19% (25/131)  remote: Compressing objects: 20% (27/131)  remote: Compressing objects: 21% (28/131)  remote: Compressing objects: 22% (29/131)  remote: Compressing objects: 23% (31/131)  remote: Compressing objects: 24% (32/131)  remote: Compressing objects: 25% (33/131)  remote: Compressing objects: 26% (35/131)  remote: Compressing objects: 27% (36/131)  remote: Compressing objects: 28% (37/131)  remote: Compressing objects: 29% (38/131)  remote: Compressing objects: 30% (40/131)  remote: Compressing objects: 31% (41/131)  remote: Compressing objects: 32% (42/131)  remote: Compressing objects: 33% (44/131)  remote: Compressing objects: 34% (45/131)  remote: Compressing objects: 35% (46/131)  remote: Compressing objects: 36% (48/131)  remote: Compressing objects: 37% (49/131)  remote: Compressing objects: 38% (50/131)  remote: Compressing objects: 39% (52/131)  remote: Compressing objects: 40% (53/131)  remote: Compressing objects: 41% (54/131)  remote: Compressing objects: 42% (56/131)  remote: Compressing objects: 43% (57/131)  remote: Compressing objects: 44% (58/131)  remote: Compressing objects: 45% (59/131)  remote: Compressing objects: 46% (61/131)  remote: Compressing objects: 47% (62/131)  remote: Compressing objects: 48% (63/131)  remote: Compressing objects: 49% (65/131)  remote: Compressing objects: 50% (66/131)  remote: Compressing objects: 51% (67/131)  remote: Compressing objects: 52% (69/131)  remote: Compressing objects: 53% (70/131)  remote: Compressing objects: 54% (71/131)  remote: Compressing objects: 55% (73/131)  remote: Compressing objects: 56% (74/131)  remote: Compressing objects: 57% (75/131)  remote: Compressing objects: 58% (76/131)  remote: Compressing objects: 59% (78/131)  remote: Compressing objects: 60% (79/131)  remote: Compressing objects: 61% (80/131)  remote: Compressing objects: 62% (82/131)  remote: Compressing objects: 63% (83/131)  remote: Compressing objects: 64% (84/131)  remote: Compressing objects: 65% (86/131)  remote: Compressing objects: 66% (87/131)  remote: Compressing objects: 67% (88/131)  remote: Compressing objects: 68% (90/131)  remote: Compressing objects: 69% (91/131)  remote: Compressing objects: 70% (92/131)  remote: Compressing objects: 71% (94/131)  remote: Compressing objects: 72% (95/131)  remote: Compressing objects: 73% (96/131)  remote: Compressing objects: 74% (97/131)  remote: Compressing objects: 75% (99/131)  remote: Compressing objects: 76% (100/131)  remote: Compressing objects: 77% (101/131)  remote: Compressing objects: 78% (103/131)  remote: Compressing objects: 79% (104/131)  remote: Compressing objects: 80% (105/131)  remote: Compressing objects: 81% (107/131)  remote: Compressing objects: 82% (108/131)  remote: Compressing objects: 83% (109/131)  remote: Compressing objects: 84% (111/131)  remote: Compressing objects: 85% (112/131)  remote: Compressing objects: 86% (113/131)  remote: Compressing objects: 87% (114/131)  remote: Compressing objects: 88% (116/131)  remote: Compressing objects: 89% (117/131)  remote: Compressing objects: 90% (118/131)  remote: Compressing objects: 91% (120/131)  remote: Compressing objects: 92% (121/131)  remote: Compressing objects: 93% (122/131)  remote: Compressing objects: 94% (124/131)  remote: Compressing objects: 95% (125/131)  remote: Compressing objects: 96% (126/131)  remote: Compressing objects: 97% (128/131)  remote: Compressing objects: 98% (129/131)  remote: Compressing objects: 99% (130/131)  remote: Compressing objects: 100% (131/131)  remote: Compressing objects: 100% (131/131), done. Receiving objects: 0% (1/475) Receiving objects: 1% (5/475) Receiving objects: 2% (10/475) Receiving objects: 3% (15/475) Receiving objects: 4% (19/475) Receiving objects: 5% (24/475) Receiving objects: 6% (29/475) Receiving objects: 7% (34/475) Receiving objects: 8% (38/475) Receiving objects: 9% (43/475) Receiving objects: 10% (48/475) Receiving objects: 11% (53/475) Receiving objects: 12% (57/475) Receiving objects: 13% (62/475) Receiving objects: 14% (67/475) Receiving objects: 15% (72/475) Receiving objects: 16% (76/475) Receiving objects: 17% (81/475) Receiving objects: 18% (86/475) Receiving objects: 19% (91/475) Receiving objects: 20% (95/475) Receiving objects: 21% (100/475) Receiving objects: 22% (105/475) Receiving objects: 23% (110/475) Receiving objects: 24% (114/475) Receiving objects: 25% (119/475) Receiving objects: 26% (124/475) Receiving objects: 27% (129/475) Receiving objects: 28% (133/475) Receiving objects: 29% (138/475) Receiving objects: 30% (143/475) Receiving objects: 31% (148/475) Receiving objects: 32% (152/475) Receiving objects: 33% (157/475) Receiving objects: 34% (162/475) Receiving objects: 35% (167/475) Receiving objects: 36% (171/475) Receiving objects: 37% (176/475) Receiving objects: 38% (181/475) Receiving objects: 39% (186/475) Receiving objects: 40% (190/475) Receiving objects: 41% (195/475) Receiving objects: 42% (200/475) Receiving objects: 43% (205/475) Receiving objects: 44% (209/475) Receiving objects: 45% (214/475) Receiving objects: 46% (219/475) Receiving objects: 47% (224/475) Receiving objects: 48% (228/475) Receiving objects: 49% (233/475) Receiving objects: 50% (238/475) Receiving objects: 51% (243/475) Receiving objects: 52% (247/475) Receiving objects: 53% (252/475) Receiving objects: 54% (257/475) Receiving objects: 55% (262/475) Receiving objects: 56% (266/475) Receiving objects: 57% (271/475) Receiving objects: 58% (276/475) Receiving objects: 59% (281/475) Receiving objects: 60% (285/475) Receiving objects: 61% (290/475) Receiving objects: 62% (295/475) Receiving objects: 63% (300/475) Receiving objects: 64% (304/475) Receiving objects: 65% (309/475) Receiving objects: 66% (314/475) Receiving objects: 67% (319/475) Receiving objects: 68% (323/475) Receiving objects: 69% (328/475) Receiving objects: 70% (333/475) Receiving objects: 71% (338/475) Receiving objects: 72% (342/475) Receiving objects: 73% (347/475) Receiving objects: 74% (352/475) Receiving objects: 75% (357/475) Receiving objects: 76% (361/475) Receiving objects: 77% (366/475) Receiving objects: 78% (371/475) Receiving objects: 79% (376/475) Receiving objects: 80% (380/475) Receiving objects: 81% (385/475) Receiving objects: 82% (390/475) Receiving objects: 83% (395/475) Receiving objects: 84% (399/475) Receiving objects: 85% (404/475) Receiving objects: 86% (409/475) Receiving objects: 87% (414/475) Receiving objects: 88% (418/475) Receiving objects: 89% (423/475) Receiving objects: 90% (428/475) Receiving objects: 91% (433/475) Receiving objects: 92% (437/475) Receiving objects: 93% (442/475) Receiving objects: 94% (447/475) Receiving objects: 95% (452/475) Receiving objects: 96% (456/475) Receiving objects: 97% (461/475) Receiving objects: 98% (466/475) Receiving objects: 99% (471/475) Receiving objects: 100% (475/475) Receiving objects: 100% (475/475), 246.64 KiB, done. Resolving deltas: 0% (1/376) Resolving deltas: 1% (6/376) Resolving deltas: 2% (10/376) Resolving deltas: 3% (15/376) Resolving deltas: 6% (25/376) Resolving deltas: 7% (29/376) Resolving deltas: 9% (36/376) Resolving deltas: 10% (41/376) Resolving deltas: 11% (45/376) Resolving deltas: 12% (48/376) Resolving deltas: 13% (49/376) Resolving deltas: 14% (55/376) Resolving deltas: 17% (66/376) Resolving deltas: 19% (72/376) Resolving deltas: 20% (77/376) Resolving deltas: 23% (89/376) Resolving deltas: 24% (91/376) Resolving deltas: 25% (94/376) remote: Total 475 (delta 376), reused 434 (delta 344) Resolving deltas: 26% (98/376) Resolving deltas: 27% (102/376) Resolving deltas: 28% (108/376) Resolving deltas: 29% (112/376) Resolving deltas: 30% (115/376) Resolving deltas: 31% (118/376) Resolving deltas: 33% (125/376) Resolving deltas: 34% (128/376) Resolving deltas: 35% (134/376) Resolving deltas: 36% (138/376) Resolving deltas: 37% (141/376) Resolving deltas: 38% (143/376) Resolving deltas: 42% (158/376) Resolving deltas: 48% (183/376) Resolving deltas: 54% (205/376) Resolving deltas: 57% (216/376) Resolving deltas: 60% (227/376) Resolving deltas: 61% (231/376) Resolving deltas: 62% (234/376) Resolving deltas: 71% (270/376) Resolving deltas: 81% (305/376) Resolving deltas: 85% (320/376) Resolving deltas: 87% (330/376) Resolving deltas: 96% (363/376) Resolving deltas: 97% (365/376) Resolving deltas: 98% (371/376) Resolving deltas: 99% (374/376) Resolving deltas: 100% (376/376) Resolving deltas: 100% (376/376), completed with 49 local objects. From /pub/scm/linux/kernel/git/mfasheh/ocfs2 22e8499..00408c7 ALL -> ocfs2 Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. remote: Counting objects: 4208, done. remote: Compressing objects: 0% (1/547)  remote: Compressing objects: 1% (6/547)  remote: Compressing objects: 2% (11/547)  remote: Compressing objects: 3% (17/547)  remote: Compressing objects: 4% (22/547)  remote: Compressing objects: 5% (28/547)  remote: Compressing objects: 6% (33/547)  remote: Compressing objects: 7% (39/547)  remote: Compressing objects: 8% (44/547)  remote: Compressing objects: 9% (50/547)  remote: Compressing objects: 10% (55/547)  remote: Compressing objects: 11% (61/547)  remote: Compressing objects: 12% (66/547)  remote: Compressing objects: 13% (72/547)  remote: Compressing objects: 14% (77/547)  remote: Compressing objects: 15% (83/547)  remote: Compressing objects: 16% (88/547)  remote: Compressing objects: 17% (93/547)  remote: Compressing objects: 18% (99/547)  remote: Compressing objects: 19% (104/547)  remote: Compressing objects: 20% (110/547)  remote: Compressing objects: 21% (115/547)  remote: Compressing objects: 22% (121/547)  remote: Compressing objects: 23% (126/547)  remote: Compressing objects: 24% (132/547)  remote: Compressing objects: 25% (137/547)  remote: Compressing objects: 26% (143/547)  remote: Compressing objects: 27% (148/547)  remote: Compressing objects: 28% (154/547)  remote: Compressing objects: 29% (159/547)  remote: Compressing objects: 30% (165/547)  remote: Compressing objects: 31% (170/547)  remote: Compressing objects: 32% (176/547)  remote: Compressing objects: 33% (181/547)  remote: Compressing objects: 34% (186/547)  remote: Compressing objects: 35% (192/547)  remote: Compressing objects: 36% (197/547)  remote: Compressing objects: 37% (203/547)  remote: Compressing objects: 38% (208/547)  remote: Compressing objects: 39% (214/547)  remote: Compressing objects: 40% (219/547)  remote: Compressing objects: 41% (225/547)  remote: Compressing objects: 42% (230/547)  remote: Compressing objects: 43% (236/547)  remote: Compressing objects: 44% (241/547)  remote: Compressing objects: 45% (247/547)  remote: Compressing objects: 46% (252/547)  remote: Compressing objects: 47% (258/547)  remote: Compressing objects: 48% (263/547)  remote: Compressing objects: 49% (269/547)  remote: Compressing objects: 50% (274/547)  remote: Compressing objects: 51% (279/547)  remote: Compressing objects: 52% (285/547)  remote: Compressing objects: 53% (290/547)  remote: Compressing objects: 54% (296/547)  remote: Compressing objects: 55% (301/547)  remote: Compressing objects: 56% (307/547)  remote: Compressing objects: 57% (312/547)  remote: Compressing objects: 58% (318/547)  remote: Compressing objects: 59% (323/547)  remote: Compressing objects: 60% (329/547)  remote: Compressing objects: 61% (334/547)  remote: Compressing objects: 62% (340/547)  remote: Compressing objects: 63% (345/547)  remote: Compressing objects: 64% (351/547)  remote: Compressing objects: 65% (356/547)  remote: Compressing objects: 66% (362/547)  remote: Compressing objects: 67% (367/547)  remote: Compressing objects: 68% (372/547)  remote: Compressing objects: 69% (378/547)  remote: Compressing objects: 70% (383/547)  remote: Compressing objects: 71% (389/547)  remote: Compressing objects: 72% (394/547)  remote: Compressing objects: 73% (400/547)  remote: Compressing objects: 74% (405/547)  remote: Compressing objects: 75% (411/547)  remote: Compressing objects: 76% (416/547)  remote: Compressing objects: 77% (422/547)  remote: Compressing objects: 78% (427/547)  remote: Compressing objects: 79% (433/547)  remote: Compressing objects: 80% (438/547)  remote: Compressing objects: 81% (444/547)  remote: Compressing objects: 82% (449/547)  remote: Compressing objects: 83% (455/547)  remote: Compressing objects: 84% (460/547)  remote: Compressing objects: 85% (465/547)  remote: Compressing objects: 86% (471/547)  remote: Compressing objects: 87% (476/547)  remote: Compressing objects: 88% (482/547)  remote: Compressing objects: 89% (487/547)  remote: Compressing objects: 90% (493/547)  remote: Compressing objects: 91% (498/547)  remote: Compressing objects: 92% (504/547)  remote: Compressing objects: 93% (509/547)  remote: Compressing objects: 94% (515/547)  remote: Compressing objects: 95% (520/547)  remote: Compressing objects: 96% (526/547)  remote: Compressing objects: 97% (531/547)  remote: Compressing objects: 98% (537/547)  remote: Compressing objects: 99% (542/547)  remote: Compressing objects: 100% (547/547)  remote: Compressing objects: 100% (547/547), done. Receiving objects: 0% (1/3804) Receiving objects: 1% (39/3804) Receiving objects: 2% (77/3804) Receiving objects: 3% (115/3804) Receiving objects: 4% (153/3804) Receiving objects: 5% (191/3804) Receiving objects: 6% (229/3804) Receiving objects: 7% (267/3804) Receiving objects: 8% (305/3804) Receiving objects: 9% (343/3804) Receiving objects: 10% (381/3804) Receiving objects: 11% (419/3804) Receiving objects: 12% (457/3804) Receiving objects: 13% (495/3804) Receiving objects: 14% (533/3804) Receiving objects: 15% (571/3804) Receiving objects: 16% (609/3804) Receiving objects: 17% (647/3804) Receiving objects: 18% (685/3804) Receiving objects: 19% (723/3804) Receiving objects: 20% (761/3804) Receiving objects: 21% (799/3804) Receiving objects: 22% (837/3804) Receiving objects: 23% (875/3804) Receiving objects: 24% (913/3804) Receiving objects: 25% (951/3804) Receiving objects: 26% (990/3804) Receiving objects: 27% (1028/3804) Receiving objects: 28% (1066/3804) Receiving objects: 29% (1104/3804) Receiving objects: 30% (1142/3804) Receiving objects: 31% (1180/3804) Receiving objects: 32% (1218/3804) Receiving objects: 33% (1256/3804) Receiving objects: 34% (1294/3804) Receiving objects: 35% (1332/3804) Receiving objects: 36% (1370/3804) Receiving objects: 37% (1408/3804) Receiving objects: 38% (1446/3804) Receiving objects: 39% (1484/3804) Receiving objects: 40% (1522/3804) Receiving objects: 41% (1560/3804) Receiving objects: 42% (1598/3804) Receiving objects: 43% (1636/3804) Receiving objects: 44% (1674/3804) Receiving objects: 45% (1712/3804) Receiving objects: 46% (1750/3804) Receiving objects: 47% (1788/3804) Receiving objects: 48% (1826/3804) Receiving objects: 49% (1864/3804) Receiving objects: 50% (1902/3804) Receiving objects: 51% (1941/3804) Receiving objects: 52% (1979/3804) Receiving objects: 53% (2017/3804) Receiving objects: 54% (2055/3804) Receiving objects: 55% (2093/3804) Receiving objects: 56% (2131/3804) remote: Total 3804 (delta 3254), reused 3804 (delta 3254) Receiving objects: 57% (2169/3804) Receiving objects: 58% (2207/3804) Receiving objects: 59% (2245/3804) Receiving objects: 60% (2283/3804) Receiving objects: 61% (2321/3804) Receiving objects: 62% (2359/3804) Receiving objects: 63% (2397/3804) Receiving objects: 64% (2435/3804) Receiving objects: 65% (2473/3804) Receiving objects: 66% (2511/3804) Receiving objects: 67% (2549/3804) Receiving objects: 68% (2587/3804) Receiving objects: 69% (2625/3804) Receiving objects: 70% (2663/3804) Receiving objects: 71% (2701/3804) Receiving objects: 72% (2739/3804) Receiving objects: 73% (2777/3804) Receiving objects: 74% (2815/3804) Receiving objects: 75% (2853/3804) Receiving objects: 76% (2892/3804) Receiving objects: 77% (2930/3804) Receiving objects: 78% (2968/3804) Receiving objects: 79% (3006/3804) Receiving objects: 80% (3044/3804) Receiving objects: 81% (3082/3804) Receiving objects: 82% (3120/3804) Receiving objects: 83% (3158/3804) Receiving objects: 84% (3196/3804) Receiving objects: 85% (3234/3804) Receiving objects: 86% (3272/3804) Receiving objects: 87% (3310/3804) Receiving objects: 88% (3348/3804) Receiving objects: 89% (3386/3804) Receiving objects: 90% (3424/3804) Receiving objects: 91% (3462/3804) Receiving objects: 92% (3500/3804) Receiving objects: 93% (3538/3804) Receiving objects: 94% (3576/3804) Receiving objects: 95% (3614/3804) Receiving objects: 96% (3652/3804) Receiving objects: 97% (3690/3804) Receiving objects: 98% (3728/3804) Receiving objects: 99% (3766/3804) Receiving objects: 100% (3804/3804) Receiving objects: 100% (3804/3804), 604.01 KiB, done. Resolving deltas: 0% (1/3254) Resolving deltas: 2% (80/3254) Resolving deltas: 3% (115/3254) Resolving deltas: 4% (140/3254) Resolving deltas: 5% (195/3254) Resolving deltas: 6% (203/3254) Resolving deltas: 7% (233/3254) Resolving deltas: 8% (263/3254) Resolving deltas: 9% (302/3254) Resolving deltas: 13% (425/3254) Resolving deltas: 15% (512/3254) Resolving deltas: 17% (584/3254) Resolving deltas: 18% (609/3254) Resolving deltas: 20% (660/3254) Resolving deltas: 35% (1148/3254) Resolving deltas: 48% (1579/3254) Resolving deltas: 49% (1599/3254) Resolving deltas: 50% (1628/3254) Resolving deltas: 51% (1662/3254) Resolving deltas: 57% (1866/3254) Resolving deltas: 58% (1888/3254) Resolving deltas: 59% (1920/3254) Resolving deltas: 60% (1957/3254) Resolving deltas: 61% (1986/3254) Resolving deltas: 62% (2026/3254) Resolving deltas: 63% (2053/3254) Resolving deltas: 64% (2096/3254) Resolving deltas: 65% (2116/3254) Resolving deltas: 66% (2152/3254) Resolving deltas: 67% (2184/3254) Resolving deltas: 68% (2213/3254) Resolving deltas: 69% (2246/3254) Resolving deltas: 70% (2293/3254) Resolving deltas: 71% (2315/3254) Resolving deltas: 72% (2347/3254) Resolving deltas: 73% (2376/3254) Resolving deltas: 77% (2536/3254) Resolving deltas: 78% (2542/3254) Resolving deltas: 82% (2684/3254) Resolving deltas: 83% (2702/3254) Resolving deltas: 84% (2734/3254) Resolving deltas: 85% (2766/3254) Resolving deltas: 86% (2799/3254) Resolving deltas: 87% (2841/3254) Resolving deltas: 88% (2866/3254) Resolving deltas: 89% (2897/3254) Resolving deltas: 90% (2930/3254) Resolving deltas: 91% (2963/3254) Resolving deltas: 92% (2996/3254) Resolving deltas: 94% (3060/3254) Resolving deltas: 95% (3100/3254) Resolving deltas: 96% (3133/3254) Resolving deltas: 99% (3250/3254) Resolving deltas: 100% (3254/3254) Resolving deltas: 100% (3254/3254), completed with 373 local objects. From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + 17a01e8...9574dcc master -> x86 (forced update) Switched to branch "x86" Finished one revert. Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" Automatic merge failed; fix conflicts and then commit the result. Switched to branch "doc" Switched to branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" Already on branch "2.6.25-rc6-mc13" nt.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch pci-replace-remaining-__function__-occurrences.patch pci-revert-pcie-utilize-pcie-transaction-pending-bit.patch pci-sh-use-generic-pci_enable_resources.patch pci-simplify-quirk-debug-output.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch series sent 444009 bytes received 1016 bytes 890050.00 bytes/sec total size is 438756 speedup is 0.99 Using base gregkh-driver pci-iova-lockdep-false-alarm-fix.patch pci-revert-pcie-utilize-pcie-transaction-pending-bit.patch pci-doc-pci-create-documentation-pci-and-move-files-into-it.patch pci-if-0-pci_assign_resource_fixed.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch ide-remove-ide-reverse-ide-core.patch pci-remove-pci_get_device_reverse.patch pci-clean-up-search.c-a-lot.patch pci-hotplug-make-cpcihp-driver-use-modern-apis.patch pci-hotplug-the-ibm-driver-is-not-dependant-on-pci_legacy.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-add-is_added-flag-to-struct-pci_dev.patch pci-remove-pcibios_fixup_ghosts.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-global-list-of-pci-devices.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-add-pci-express-aspm-support.patch pci-add-generic-pci_enable_resources.patch pci-alpha-use-generic-pci_enable_resources.patch pci-arm-use-generic-pci_enable_resources.patch pci-cris-use-generic-pci_enable_resources.patch pci-frv-use-generic-pci_enable_resources.patch pci-ia64-use-generic-pci_enable_resources.patch pci-mips-use-generic-pci_enable_resources.patch pci-mn10300-use-generic-pci_enable_resources.patch pci-parisc-use-generic-pci_enable_resources.patch pci-powerpc-use-generic-pci_enable_resources.patch pci-ppc-use-generic-pci_enable_resources.patch pci-sh-use-generic-pci_enable_resources.patch pci-sparc64-use-generic-pci_enable_resources.patch pci-v850-use-generic-pci_enable_resources.patch pci-x86-use-generic-pci_enable_resources.patch pci-xtensa-use-generic-pci_enable_resources.patch pci-iova-rb-tree-setup-tweak.patch pci-simplify-quirk-debug-output.patch pci-iommu-iotlb-flushing.patch pci-expose-pci-vpd-through-sysfs.patch pci-replace-remaining-__function__-occurrences.patch ## # merge gregkh-pci resolve /home/jejb/gregkh-pci-fixup.diff ## Auto-merged Documentation/ide/ide.txt CONFLICT (content): Merge conflict in Documentation/ide/ide.txt Auto-merged Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide-scan-pci.c Auto-merged drivers/ide/ide.c Auto-merged include/linux/ide.h Created commit 7f52e5e: Resolve Patch: /home/jejb/gregkh-pci-fixup.diff ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch series ub-drop-bug-and-update-small-things.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-add-support-for-motorola-rokr-z6-cellphone-in-mass-storage-mode.patch usb-add-usb-serial-spcp8x5-driver.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-check-serial-number-string-after-device-reset.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-speed-handling.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ehci-stop-vt6212-bus-hogging.patch usb-ehci-tolerates-some-buggy-devices.patch usb-enable-usb-persist-by-default.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-fix-cut-and-paste-error-in-rtl8150.c.patch usb-fix-gadgetfs-class-request-delegation.patch usb-ftdi_sio-note-missing-locking.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-increase-cdc-acm-write-throughput.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-isd200-fix-memory-leak-in-isd200_get_inquiry_data.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-libusual-locking-cleanup.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-new-quirk-flag-to-avoid-set-interface.patch usb-ohci-port-reset-paranoia-timeout.patch usb-partial-usb-embedded-host-support.patch usb-pl2303-another-product-id.patch usb-remove-config_usb_persist-setting.patch usb-remove-dev-power.power_state.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-reorganize-code-in-hub.c.patch usb-replace-remaining-__function__-occurrences.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-sierra-add-another-device-id.patch usb-sierra-dma-fixes.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-usb.h-reduce-syslog-clutter.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-use-div_round_up.patch usbmon-restore-mmap.patch sent 916364 bytes received 1720 bytes 612056.00 bytes/sec total size is 907094 speedup is 0.99 Using base gregkh-pci usb-fix-gadgetfs-class-request-delegation.patch usb-new-quirk-flag-to-avoid-set-interface.patch usb-pl2303-another-product-id.patch usb-isd200-fix-memory-leak-in-isd200_get_inquiry_data.patch usb-add-support-for-motorola-rokr-z6-cellphone-in-mass-storage-mode.patch usb-sierra-dma-fixes.patch usb-sierra-add-another-device-id.patch usb-ehci-stop-vt6212-bus-hogging.patch usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch usb-reorganize-code-in-hub.c.patch usb-make-usb-persist-work-after-every-system-sleep.patch usb-remove-config_usb_persist-setting.patch usb-check-serial-number-string-after-device-reset.patch usb-enable-usb-persist-by-default.patch usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb-microtek-remove-unused-semaphore.patch usb-libusual-locking-cleanup.patch usb-make-usb_storage_onetouch-available-with-pm.patch usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch usb-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ohci-port-reset-paranoia-timeout.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-m66592-udc-reduce-size-of-data-structure.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch usb-cypress_m8-feature-buffer-fixes.patch usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch usb-cypress_m8-get-rid-of-pointless-null-check.patch usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch usb-misc-auerswald-cp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-minor-ehci-xitd-simplifications.patch usb-usb-serial-prepare-for-bkl-push-down.patch usb-ftdi_sio-note-missing-locking.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch usb-iuu_phoenix-lock-priv-tiostatus-properly.patch usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-use-div_round_up.patch usb-io_ti.c-remove-unneeded-null-tty-check.patch usb-partial-usb-embedded-host-support.patch usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch usb-ipaq-fix-devices-having-more-than-one-endpoint.patch usb-remove-dev-power.power_state.patch usb-ehci-paranoia-reject-large-control-transfers.patch usb-cypress_m8-speed-handling.patch drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch usb-usb.h-reduce-syslog-clutter.patch usb-standardize-inclusion-protection-and-add-where-missing.patch usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch usb-remove-experimental-designation-from-usb-mdc800-support.patch usb-remove-experimental-from-dynamic-usb-minor-allocation.patch usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch usb-a-couple-corrections-and-clarifications-in-usb-doc.patch usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch usb-fix-cut-and-paste-error-in-rtl8150.c.patch ub-drop-bug-and-update-small-things.patch usbmon-restore-mmap.patch usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch usb-increase-cdc-acm-write-throughput.patch usb-add-usb-serial-spcp8x5-driver.patch usb-replace-remaining-__function__-occurrences.patch usb-remove-unnecessary-type-casting-of-urb-context.patch usb-gotemp.patch ## # merge gregkh-usb ## Merge made by recursive. Documentation/DocBook/writing_usb_driver.tmpl | 14 +- Documentation/usb/persist.txt | 43 +- drivers/block/ub.c | 76 +- drivers/net/usb/rtl8150.c | 2 +- drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/class/cdc-acm.c | 88 +- drivers/usb/class/cdc-acm.h | 7 +- drivers/usb/core/Kconfig | 42 +- drivers/usb/core/config.c | 17 + drivers/usb/core/devio.c | 46 +- drivers/usb/core/driver.c | 51 +- drivers/usb/core/hcd-pci.c | 5 - drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.c | 274 +++++--- drivers/usb/core/hub.h | 8 +- drivers/usb/core/inode.c | 4 +- drivers/usb/core/message.c | 15 +- drivers/usb/core/quirks.c | 17 + drivers/usb/core/sysfs.c | 22 +- drivers/usb/core/urb.c | 2 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 18 +- drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/dummy_hcd.c | 14 +- drivers/usb/gadget/ether.c | 12 +- drivers/usb/gadget/file_storage.c | 8 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/goku_udc.c | 20 +- drivers/usb/gadget/inode.c | 22 +- drivers/usb/gadget/lh7a40x_udc.c | 132 ++-- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 20 +- drivers/usb/gadget/printer.c | 6 +- drivers/usb/gadget/pxa2xx_udc.c | 26 +- drivers/usb/gadget/rndis.c | 146 ++-- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 72 +- drivers/usb/host/ehci-hub.c | 17 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-pci.c | 15 +- drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-ps3.c | 1 - drivers/usb/host/ehci-q.c | 20 +- drivers/usb/host/ehci-sched.c | 46 +- drivers/usb/host/isp116x-hcd.c | 12 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-ep93xx.c | 2 - drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-omap.c | 2 - drivers/usb/host/ohci-ps3.c | 1 - drivers/usb/host/ohci-pxa27x.c | 2 - drivers/usb/host/ohci-sm501.c | 7 +- drivers/usb/host/pci-quirks.c | 6 +- drivers/usb/host/r8a66597-hcd.c | 8 +- drivers/usb/host/sl811-hcd.c | 12 +- drivers/usb/host/u132-hcd.c | 7 +- drivers/usb/host/uhci-hcd.c | 8 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/image/Kconfig | 4 +- drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/misc/Kconfig | 29 +- drivers/usb/misc/Makefile | 1 + drivers/usb/misc/adutux.c | 120 ++-- drivers/usb/misc/appledisplay.c | 6 +- drivers/usb/misc/auerswald.c | 135 ++-- drivers/usb/misc/emi26.c | 30 +- drivers/usb/misc/emi62.c | 32 +- drivers/usb/misc/ftdi-elan.c | 2 +- drivers/usb/misc/gotemp.c | 295 +++++++ drivers/usb/misc/iowarrior.c | 10 +- drivers/usb/misc/ldusb.c | 10 +- drivers/usb/misc/legousbtower.c | 92 ++-- drivers/usb/misc/phidgetkit.c | 6 +- drivers/usb/misc/phidgetmotorcontrol.c | 2 +- drivers/usb/misc/phidgetservo.c | 6 +- drivers/usb/misc/usblcd.c | 8 +- drivers/usb/misc/usbtest.c | 13 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 9 +- drivers/usb/mon/mon_main.c | 3 +- drivers/usb/serial/Kconfig | 60 +- drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/aircable.c | 52 +- drivers/usb/serial/airprime.c | 34 +- drivers/usb/serial/ark3116.c | 6 +- drivers/usb/serial/belkin_sa.c | 20 +- drivers/usb/serial/console.c | 10 +- drivers/usb/serial/cp2101.c | 108 ++-- drivers/usb/serial/cyberjack.c | 78 +- drivers/usb/serial/cypress_m8.c | 567 ++++++------- drivers/usb/serial/digi_acceleport.c | 44 +- drivers/usb/serial/empeg.c | 56 +- drivers/usb/serial/ezusb.c | 8 +- drivers/usb/serial/ftdi_sio.c | 168 ++-- drivers/usb/serial/garmin_gps.c | 112 ++-- drivers/usb/serial/generic.c | 48 +- drivers/usb/serial/io_edgeport.c | 326 ++++---- drivers/usb/serial/io_ti.c | 392 +++++----- drivers/usb/serial/ipaq.c | 54 +- drivers/usb/serial/ipw.c | 48 +- drivers/usb/serial/ir-usb.c | 50 +- drivers/usb/serial/iuu_phoenix.c | 162 ++-- drivers/usb/serial/keyspan.c | 262 +++--- drivers/usb/serial/keyspan_pda.c | 24 +- drivers/usb/serial/kl5kusb105.c | 82 +- drivers/usb/serial/kobil_sct.c | 71 +- drivers/usb/serial/mct_u232.c | 38 +- drivers/usb/serial/mos7720.c | 118 ++-- drivers/usb/serial/mos7840.c | 159 ++-- drivers/usb/serial/navman.c | 18 +- drivers/usb/serial/omninet.c | 36 +- drivers/usb/serial/option.c | 71 +- drivers/usb/serial/oti6858.c | 114 ++-- drivers/usb/serial/pl2303.c | 113 ++-- drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/safe_serial.c | 30 +- drivers/usb/serial/sierra.c | 84 ++- drivers/usb/serial/spcp8x5.c | 1075 +++++++++++++++++++++++++ drivers/usb/serial/ti_usb_3410_5052.c | 205 +++--- drivers/usb/serial/usb-serial.c | 89 ++- drivers/usb/serial/visor.c | 92 ++-- drivers/usb/serial/whiteheat.c | 110 ++-- drivers/usb/storage/Kconfig | 39 +- drivers/usb/storage/Makefile | 1 + drivers/usb/storage/cypress_atacb.c | 200 +++++ drivers/usb/storage/cypress_atacb.h | 25 + drivers/usb/storage/isd200.c | 1 + drivers/usb/storage/libusual.c | 14 +- drivers/usb/storage/scsiglue.c | 12 +- drivers/usb/storage/transport.c | 26 +- drivers/usb/storage/unusual_devs.h | 19 + drivers/usb/storage/usb.c | 26 +- drivers/usb/usb-skeleton.c | 8 +- include/linux/usb.h | 181 +++-- include/linux/usb/audio.h | 2 +- include/linux/usb/cdc.h | 4 + include/linux/usb/ch9.h | 16 +- include/linux/usb/g_printer.h | 4 + include/linux/usb/gadget.h | 2 +- include/linux/usb/gadgetfs.h | 16 +- include/linux/usb/input.h | 8 +- include/linux/usb/iowarrior.h | 6 +- include/linux/usb/isp116x.h | 6 +- include/linux/usb/midi.h | 2 +- include/linux/usb/net2280.h | 9 +- include/linux/usb/otg.h | 6 +- include/linux/usb/quirks.h | 8 + include/linux/usb/rndis_host.h | 9 +- include/linux/usb/serial.h | 3 +- include/linux/usb/sl811.h | 5 +- include/linux/usb/usbnet.h | 8 +- include/linux/usb_usual.h | 5 +- 162 files changed, 5000 insertions(+), 3197 deletions(-) create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c create mode 100644 drivers/usb/storage/cypress_atacb.c create mode 100644 drivers/usb/storage/cypress_atacb.h ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git agp-patches agp ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/perex/alsa.git linus alsa ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 59 ++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_atihdmi.c | 6 + sound/pci/hda/patch_cmedia.c | 1 + sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 130 ++++++++++++++-------- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 1 + sound/pci/hda/patch_via.c | 1 + sound/pci/ice1712/hoontech.c | 21 +++- sound/pci/ice1712/revo.c | 51 +++++----- sound/pci/intel8x0.c | 6 + sound/usb/caiaq/caiaq-control.c | 4 +- 17 files changed, 264 insertions(+), 124 deletions(-) ## # skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## SKIPPING: skip git /pub/scm/linux/kernel/git/viro/audit-current.git audit.b36 audit-mm ## # git /pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git avr32-arch avr32 ## Removed arch/avr32/mach-at32ap/time-tc.c Auto-merged drivers/misc/Kconfig Removed include/asm-avr32/arch-at32ap/time.h Removed include/asm-avr32/intc.h Merge made by recursive. arch/avr32/Kconfig | 5 + arch/avr32/kernel/entry-avr32b.S | 20 -- arch/avr32/kernel/process.c | 4 +- arch/avr32/kernel/time.c | 248 +++++++++----------------- arch/avr32/kernel/traps.c | 4 + arch/avr32/mach-at32ap/Makefile | 3 +- arch/avr32/mach-at32ap/at32ap700x.c | 243 +++++++++++++++++++++++-- arch/avr32/mach-at32ap/intc.c | 1 - arch/avr32/mach-at32ap/pm-at32ap700x.S | 66 +++++++ arch/avr32/mach-at32ap/time-tc.c | 218 ----------------------- arch/avr32/oprofile/op_model_avr32.c | 1 - drivers/char/keyboard.c | 3 +- drivers/clocksource/Makefile | 1 + drivers/clocksource/tcb_clksrc.c | 305 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 33 ++++ drivers/misc/Makefile | 1 + drivers/misc/atmel_tclib.c | 161 +++++++++++++++++ drivers/usb/gadget/atmel_usba_udc.c | 126 +++++--------- include/asm-avr32/arch-at32ap/board.h | 9 +- include/asm-avr32/arch-at32ap/pm.h | 48 +++++ include/asm-avr32/arch-at32ap/time.h | 112 ------------ include/asm-avr32/asm.h | 8 +- include/asm-avr32/byteorder.h | 6 + include/asm-avr32/intc.h | 128 ------------- include/asm-avr32/irq.h | 5 + include/asm-avr32/page.h | 8 +- include/asm-avr32/processor.h | 2 +- include/linux/atmel_tc.h | 252 ++++++++++++++++++++++++++ include/linux/usb/atmel_usba_udc.h | 22 +++ 29 files changed, 1278 insertions(+), 765 deletions(-) create mode 100644 arch/avr32/mach-at32ap/pm-at32ap700x.S delete mode 100644 arch/avr32/mach-at32ap/time-tc.c create mode 100644 drivers/clocksource/tcb_clksrc.c create mode 100644 drivers/misc/atmel_tclib.c create mode 100644 include/asm-avr32/arch-at32ap/pm.h delete mode 100644 include/asm-avr32/arch-at32ap/time.h delete mode 100644 include/asm-avr32/intc.h create mode 100644 include/linux/atmel_tc.h create mode 100644 include/linux/usb/atmel_usba_udc.h ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Merge made by recursive. drivers/acpi/processor_thermal.c | 30 +++++---- drivers/cpufreq/cpufreq.c | 129 +++++++++++++++++--------------------- drivers/cpufreq/cpufreq_stats.c | 6 ++- 3 files changed, 78 insertions(+), 87 deletions(-) ## # git /pub/scm/linux/kernel/git/agk/linux-2.6-dm.git master dm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Auto-merged arch/powerpc/platforms/cell/iommu.c Auto-merged arch/powerpc/platforms/powermac/setup.c Merge made by recursive. arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/btext.c | 3 +- arch/powerpc/kernel/crash.c | 3 +- arch/powerpc/kernel/crash_dump.c | 3 +- arch/powerpc/kernel/head_32.S | 17 -- arch/powerpc/kernel/machine_kexec.c | 3 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/kernel/vdso.c | 3 +- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/hash_utils_64.c | 26 +++- arch/powerpc/mm/init_32.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/numa.c | 3 +- arch/powerpc/mm/ppc_mmu_32.c | 2 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 7 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/maple/setup.c | 2 +- arch/powerpc/platforms/pasemi/dma_lib.c | 144 ++++++++++++++ arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/htab.c | 3 +- arch/powerpc/platforms/ps3/mm.c | 3 +- arch/powerpc/platforms/ps3/os-area.c | 3 +- arch/powerpc/platforms/pseries/lpar.c | 15 ++ arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/powerpc/sysdev/mpic.c | 32 ++-- arch/ppc/8xx_io/commproc.c | 2 +- arch/ppc/kernel/head.S | 17 -- arch/sparc64/Kconfig | 1 + drivers/net/Makefile | 3 +- drivers/net/pasemi_mac.c | 324 +++++++++++++++++++++++++------ drivers/net/pasemi_mac.h | 35 ++++- drivers/net/pasemi_mac_ethtool.c | 159 +++++++++++++++ include/asm-powerpc/abs_addr.h | 3 +- include/asm-powerpc/cputhreads.h | 2 +- include/asm-powerpc/lmb.h | 82 +------- include/asm-powerpc/machdep.h | 2 + include/asm-powerpc/pasemi_dma.h | 77 +++++++- include/asm-powerpc/sparsemem.h | 1 + include/asm-sparc64/lmb.h | 10 + include/linux/lmb.h | 83 ++++++++ lib/Kconfig | 3 + lib/Makefile | 2 + {arch/powerpc/mm => lib}/lmb.c | 141 ++++++++------ 48 files changed, 966 insertions(+), 280 deletions(-) create mode 100644 drivers/net/pasemi_mac_ethtool.c create mode 100644 include/asm-sparc64/lmb.h create mode 100644 include/linux/lmb.h rename {arch/powerpc/mm => lib}/lmb.c (68%) ## # git /pub/scm/linux/kernel/git/airlied/agp-2.6.git master drm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mchehab/v4l-dvb.git devel dvb ## Merge made by recursive. Documentation/video4linux/CARDLIST.bttv | 2 + Documentation/video4linux/CARDLIST.cx88 | 8 + Documentation/video4linux/CARDLIST.saa7134 | 7 + arch/arm/mach-pxa/devices.c | 32 + arch/arm/mach-pxa/pcm990-baseboard.c | 86 + drivers/media/Kconfig | 7 +- drivers/media/common/ir-functions.c | 2 +- drivers/media/common/ir-keymaps.c | 53 +- drivers/media/common/saa7146_core.c | 8 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_vbi.c | 4 +- drivers/media/common/saa7146_video.c | 4 +- drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- drivers/media/dvb/dvb-core/demux.h | 2 + drivers/media/dvb/dvb-core/dmxdev.c | 10 +- drivers/media/dvb/dvb-core/dvb_demux.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- drivers/media/dvb/dvb-usb/cxusb.c | 1 - drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22702.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 2 +- drivers/media/dvb/frontends/isl6405.c | 164 ++ drivers/media/dvb/frontends/isl6405.h | 74 + drivers/media/dvb/frontends/lgdt330x.c | 2 +- drivers/media/dvb/frontends/nxt6000.c | 2 +- drivers/media/dvb/frontends/s5h1409.c | 2 +- drivers/media/dvb/frontends/s5h1420.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 12 +- drivers/media/dvb/frontends/tda1004x.h | 1 - drivers/media/dvb/frontends/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 26 +- drivers/media/dvb/frontends/tda18271-fe.c | 309 ++--- drivers/media/dvb/frontends/tda18271-priv.h | 8 +- drivers/media/dvb/frontends/tda18271-tables.c | 84 +- drivers/media/dvb/frontends/tda18271.h | 11 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 167 +- drivers/media/dvb/frontends/tda827x.h | 4 +- drivers/media/dvb/frontends/ves1x93.c | 2 +- drivers/media/dvb/frontends/xc5000.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 4 +- drivers/media/radio/miropcm20-rds.c | 2 +- drivers/media/radio/radio-cadet.c | 10 +- drivers/media/radio/radio-sf16fmr2.c | 102 +- drivers/media/radio/radio-typhoon.c | 2 +- drivers/media/video/Kconfig | 45 + drivers/media/video/Makefile | 8 +- drivers/media/video/adv7170.c | 2 +- drivers/media/video/adv7175.c | 2 +- drivers/media/video/arv.c | 4 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt856.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 55 +- drivers/media/video/bt8xx/bttv-driver.c | 43 +- drivers/media/video/bt8xx/bttv-input.c | 6 + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 2 + drivers/media/video/bw-qcam.c | 4 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 4 +- drivers/media/video/cpia2/cpia2_core.c | 4 +- drivers/media/video/cpia2/cpia2_usb.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 7 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-core.c | 91 +- drivers/media/video/cx25840/cx25840-core.h | 2 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx25840/cx25840-vbi.c | 6 +- drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 529 ++++++- drivers/media/video/cx88/cx88-core.c | 8 +- drivers/media/video/cx88/cx88-dvb.c | 163 ++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 9 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-tvaudio.c | 6 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 17 +- drivers/media/video/cx88/cx88.h | 8 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 2 +- drivers/media/video/em28xx/em28xx-core.c | 24 +- drivers/media/video/em28xx/em28xx-i2c.c | 4 +- drivers/media/video/em28xx/em28xx-video.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/hexium_gemini.c | 4 +- drivers/media/video/hexium_orion.c | 4 +- drivers/media/video/ir-kbd-i2c.c | 26 +- drivers/media/video/ivtv/ivtv-cards.c | 7 +- drivers/media/video/ivtv/ivtv-cards.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 44 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-queue.c | 4 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 12 +- drivers/media/video/msp3400-kthreads.c | 15 +- drivers/media/video/mt20xx.c | 9 +- drivers/media/video/mt9m001.c | 722 ++++++++ drivers/media/video/mt9v022.c | 846 ++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/pms.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-context.c | 116 +- drivers/media/video/pvrusb2/pvrusb2-context.h | 8 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 52 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 10 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 9 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 20 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 394 ++++- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 4 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 186 ++- drivers/media/video/pwc/pwc-if.c | 8 +- drivers/media/video/pxa_camera.c | 985 +++++++++++ drivers/media/video/saa6588.c | 8 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7111.c | 2 +- drivers/media/video/saa7114.c | 2 +- drivers/media/video/saa7115.c | 4 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 347 ++++- drivers/media/video/saa7134/saa7134-core.c | 52 +- drivers/media/video/saa7134/saa7134-dvb.c | 346 +++-- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 6 +- drivers/media/video/saa7134/saa7134-reg.h | 3 + drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 17 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 4 +- drivers/media/video/sn9c102/sn9c102_core.c | 4 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 998 +++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 9 +- drivers/media/video/tda8290.c | 12 +- drivers/media/video/tda8290.h | 2 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 42 +- drivers/media/video/tea5761.c | 7 +- drivers/media/video/tea5767.c | 34 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/tea6420.c | 2 +- drivers/media/video/tuner-core.c | 47 +- drivers/media/video/tuner-i2c.h | 118 ++- drivers/media/video/tuner-simple.c | 824 +++++++--- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 188 ++- drivers/media/video/tuner-xc2028.c | 33 +- drivers/media/video/tvaudio.c | 8 +- drivers/media/video/tveeprom.c | 103 -- drivers/media/video/tvp5150.c | 2 +- drivers/media/video/usbvideo/ibmcam.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvideo/ultracam.c | 4 +- drivers/media/video/usbvideo/usbvideo.c | 6 +- drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 1737 +++++++++++--------- drivers/media/video/videobuf-core.c | 7 +- drivers/media/video/videobuf-dma-sg.c | 121 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/videocodec.c | 4 +- drivers/media/video/vino.c | 10 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/w9966.c | 4 +- drivers/media/video/w9968cf.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran_card.c | 6 +- drivers/media/video/zoran_device.c | 5 +- drivers/media/video/zoran_driver.c | 2 +- drivers/media/video/zr36016.c | 5 +- drivers/media/video/zr36050.c | 5 +- drivers/media/video/zr36060.c | 6 +- drivers/media/video/zr364xx.c | 4 +- include/asm-arm/arch-pxa/camera.h | 48 + include/asm-arm/arch-pxa/pxa-regs.h | 147 ++- include/linux/dvb/dmx.h | 3 +- include/linux/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/ir-common.h | 1 + include/media/soc_camera.h | 173 ++ include/media/tuner-types.h | 17 +- include/media/tuner.h | 2 +- include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-core.h | 4 +- include/media/videobuf-dma-sg.h | 14 +- 213 files changed, 9274 insertions(+), 2572 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6405.c create mode 100644 drivers/media/dvb/frontends/isl6405.h create mode 100644 drivers/media/video/mt9m001.c create mode 100644 drivers/media/video/mt9v022.c create mode 100644 drivers/media/video/pxa_camera.c create mode 100644 drivers/media/video/soc_camera.c create mode 100644 include/asm-arm/arch-pxa/camera.h create mode 100644 include/media/soc_camera.h ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## 2.6.25-rc6-git1 to bde4f8fa8db2abd5ac9c542d76012d0fedab050f Using base bde4f8fa8db2abd5ac9c542d76012d0fedab050f i2c-bfin-twi-disable-BF54x.patch i2c-omap-i2c-clock-race.patch sound-tlv320aic3x-fix-driverid-abuse.patch i2c-fix-docbook-problem.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.patch i2c-pca-03-platform-driver.patch i2c-ibm_iic-01-change-log-levels.patch i2c-ibm_iic-02-of-platform.patch i2c-dev-split-i2cdev_ioctl.patch i2c-bus-driver-for-sh7760-soc.patch i2c-replace-remaining-__FUNCTION__-occurrences.patch i2c-remove-whitespaces-in-busses-Kconfig.patch i2c-isp1301_omap-convert-to-new-style-1.patch ## # merge i2c ## Removed drivers/i2c/algos/i2c-algo-pca.h Merge made by recursive. drivers/i2c/algos/Kconfig | 39 +-- drivers/i2c/algos/i2c-algo-pca.c | 126 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 58 +++-- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-davinci.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++- drivers/i2c/busses/i2c-omap.c | 36 ++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++-- drivers/i2c/busses/i2c-pca-platform.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-pnx.c | 44 ++-- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 4 +- drivers/i2c/busses/i2c-sh7760.c | 577 +++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 87 +++--- drivers/i2c/i2c-core.c | 6 +- drivers/i2c/i2c-dev.c | 329 ++++++++++--------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- include/linux/i2c-pca-platform.h | 12 + sound/soc/codecs/tlv320aic3x.c | 2 - 22 files changed, 1534 insertions(+), 433 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-pca-platform.c create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h create mode 100644 include/linux/i2c-pca-platform.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Auto-merged drivers/hid/hid-core.c Auto-merged drivers/hid/usbhid/hid-core.c Auto-merged drivers/hid/usbhid/hid-quirks.c Merge made by recursive. drivers/hid/hid-core.c | 4 +- drivers/hid/hid-debug.c | 2 +- drivers/hid/hid-input-quirks.c | 22 +++- drivers/hid/usbhid/hid-core.c | 40 ++++--- drivers/hid/usbhid/hid-quirks.c | 54 ++++++++ drivers/hid/usbhid/hiddev.c | 286 ++++++++++++++++++++------------------- include/linux/hid.h | 5 +- 7 files changed, 256 insertions(+), 157 deletions(-) ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Merge made by recursive. drivers/input/keyboard/pxa27x_keypad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/shaggy/jfs-2.6.git for-linus jfs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/sam/kbuild.git master kbuild ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Auto-merged arch/x86/kernel/reboot.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 18 ++ arch/x86/kernel/Makefile | 2 + arch/x86/kernel/crash.c | 3 +- arch/x86/kernel/kvm.c | 247 +++++++++++++++ arch/x86/kernel/kvmclock.c | 187 ++++++++++++ arch/x86/kernel/reboot.c | 13 +- arch/x86/kernel/setup_32.c | 6 + arch/x86/kernel/setup_64.c | 7 + arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 600 +++++++++++++++++++++++++++++++++++++ arch/x86/kvm/i8254.h | 62 ++++ arch/x86/kvm/irq.c | 3 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 8 +- arch/x86/kvm/mmu.c | 563 ++++++++++++++++++++++++++++++----- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 70 +++-- arch/x86/kvm/segment_descriptor.h | 29 -- arch/x86/kvm/svm.c | 229 +++++++++++---- arch/x86/kvm/vmx.c | 139 +++++++--- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 386 +++++++++++++++++++----- arch/x86/kvm/x86_emulate.c | 256 +++++++++------- include/asm-x86/kvm.h | 21 ++ include/asm-x86/kvm_host.h | 60 ++++- include/asm-x86/kvm_para.h | 55 ++++ include/asm-x86/reboot.h | 2 + include/linux/kvm.h | 10 + include/linux/kvm_host.h | 23 +- include/linux/kvm_para.h | 11 +- virt/kvm/kvm_main.c | 91 +++++- 31 files changed, 2664 insertions(+), 458 deletions(-) create mode 100644 arch/x86/kernel/kvm.c create mode 100644 arch/x86/kernel/kvmclock.c create mode 100644 arch/x86/kvm/i8254.c create mode 100644 arch/x86/kvm/i8254.h delete mode 100644 arch/x86/kvm/segment_descriptor.h ## # git git://git.o-hand.com/linux-rpurdie-leds for-linus leds ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-linus block-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-fixes libata-upstream-fixes ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream libata-upstream ## BRANCH upstream not in tree /pub/scm/linux/kernel/git/jgarzik/libata-dev.git, SKIPPING ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## ## # revert a1dcf69bd2f16de76f530c80c11d1356b13f5423 infiniband ## Auto-merged drivers/infiniband/hw/amso1100/c2_qp.c Auto-merged drivers/infiniband/hw/amso1100/c2_rnic.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/nes/nes.c Auto-merged drivers/infiniband/hw/nes/nes.h Auto-merged drivers/infiniband/hw/nes/nes_cm.c Auto-merged drivers/infiniband/hw/nes/nes_hw.c Auto-merged drivers/infiniband/hw/nes/nes_nic.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c Created commit da89bd5: Revert "IB: Replace remaining __FUNCTION__ occurrences with __func__" 26 files changed, 302 insertions(+), 302 deletions(-) ## # merge infiniband resolve /home/jejb/infiniband-fixup.diff ## Auto-merged drivers/infiniband/core/uverbs.h Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/cxgb3/iwch_provider.c Auto-merged drivers/infiniband/hw/ipath/ipath_diag.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/infiniband/hw/ipath/ipath_kernel.h Auto-merged drivers/infiniband/hw/ipath/ipath_verbs.c Auto-merged drivers/infiniband/hw/mlx4/main.c Auto-merged drivers/infiniband/hw/mthca/mthca_provider.c Auto-merged drivers/infiniband/hw/nes/nes_cm.c Auto-merged drivers/infiniband/hw/nes/nes_verbs.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c Auto-merged drivers/infiniband/ulp/srp/ib_srp.c Auto-merged include/rdma/ib_verbs.h Created commit 1acb733: Resolve Patch: /home/jejb/infiniband-fixup.diff ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release acpi ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git for-linus arm-for-linus ## Already up-to-date. ## # git /home/rmk/linux-2.6-arm.git master arm ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus ieee1394-for-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git master ieee1394 ## Merge made by recursive. Documentation/debugging-via-ohci1394.txt | 13 +- drivers/firewire/fw-card.c | 40 +----- drivers/firewire/fw-cdev.c | 13 +- drivers/firewire/fw-device.c | 263 ++++++++++++++++++++++++------ drivers/firewire/fw-device.h | 38 +++- drivers/firewire/fw-ohci.c | 114 +++++++------- drivers/firewire/fw-sbp2.c | 150 ++++++++--------- drivers/firewire/fw-topology.c | 3 + drivers/firewire/fw-topology.h | 11 +- drivers/firewire/fw-transaction.c | 11 +- drivers/firewire/fw-transaction.h | 6 - drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/highlevel.c | 6 +- drivers/ieee1394/ieee1394_core.c | 2 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 111 ++++++------- drivers/ieee1394/pcilynx.c | 12 +- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 11 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 + 22 files changed, 487 insertions(+), 346 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-fixes-for-linus iop-fixes ## Already up-to-date. ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged crypto/async_tx/async_tx.c Auto-merged crypto/async_tx/async_xor.c Auto-merged drivers/dma/dmaengine.c Auto-merged drivers/dma/fsldma.c Auto-merged drivers/dma/iop-adma.c Merge made by recursive. crypto/async_tx/async_tx.c | 197 ++++++++++++++++++++++++++------ drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 8 -- drivers/dma/ioat_dma.c | 12 -- drivers/dma/iop-adma.c | 21 +--- include/asm-arm/arch-iop13xx/adma.h | 5 - include/asm-arm/hardware/iop3xx-adma.h | 8 -- include/asm-arm/hardware/iop_adma.h | 2 - include/linux/dmaengine.h | 11 +-- 9 files changed, 170 insertions(+), 97 deletions(-) ## # git git://www.linux-mips.org/pub/scm/upstream-linus.git upstream mips ## Already up-to-date. ## # git git://www.linux-mips.org/pub/scm/upstream.git master mips-devel ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-linus mmc ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/drzeus/mmc.git for-andrew mmc-devel ## Already up-to-date. ## # git git://git.infradead.org/mtd-2.6.git master mtd ## Merge made by recursive. drivers/mtd/onenand/onenand_base.c | 32 +++++++++++++++++--------------- fs/jffs2/fs.c | 14 +++++++++++--- 2 files changed, 28 insertions(+), 18 deletions(-) ## # gitfetch /pub/scm/linux/kernel/git/davem/net-2.6.26.git master net ## ## # merge net resolve /home/jejb/net-fixup.diff ## Auto-merged Documentation/feature-removal-schedule.txt Removed Documentation/networking/bcm43xx.txt Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged drivers/net/Makefile Removed drivers/net/atl1/Makefile Removed drivers/net/atl1/atl1.h Removed drivers/net/atl1/atl1_ethtool.c Removed drivers/net/atl1/atl1_hw.c Removed drivers/net/atl1/atl1_hw.h Removed drivers/net/atl1/atl1_param.c Removed drivers/net/sk98lin/Makefile Removed drivers/net/sk98lin/h/lm80.h Removed drivers/net/sk98lin/h/skaddr.h Removed drivers/net/sk98lin/h/skcsum.h Removed drivers/net/sk98lin/h/skdebug.h Removed drivers/net/sk98lin/h/skdrv1st.h Removed drivers/net/sk98lin/h/skdrv2nd.h Removed drivers/net/sk98lin/h/skerror.h Removed drivers/net/sk98lin/h/skgedrv.h Removed drivers/net/sk98lin/h/skgehw.h Removed drivers/net/sk98lin/h/skgehwt.h Removed drivers/net/sk98lin/h/skgei2c.h Removed drivers/net/sk98lin/h/skgeinit.h Removed drivers/net/sk98lin/h/skgepnm2.h Removed drivers/net/sk98lin/h/skgepnmi.h Removed drivers/net/sk98lin/h/skgesirq.h Removed drivers/net/sk98lin/h/ski2c.h Removed drivers/net/sk98lin/h/skqueue.h Removed drivers/net/sk98lin/h/skrlmt.h Removed drivers/net/sk98lin/h/sktimer.h Removed drivers/net/sk98lin/h/sktypes.h Removed drivers/net/sk98lin/h/skversion.h Removed drivers/net/sk98lin/h/skvpd.h Removed drivers/net/sk98lin/h/xmac_ii.h Removed drivers/net/sk98lin/skaddr.c Removed drivers/net/sk98lin/skdim.c Removed drivers/net/sk98lin/skethtool.c Removed drivers/net/sk98lin/skge.c Removed drivers/net/sk98lin/skgehwt.c Removed drivers/net/sk98lin/skgeinit.c Removed drivers/net/sk98lin/skgemib.c Removed drivers/net/sk98lin/skgepnmi.c Removed drivers/net/sk98lin/skgesirq.c Removed drivers/net/sk98lin/ski2c.c Removed drivers/net/sk98lin/sklm80.c Removed drivers/net/sk98lin/skqueue.c Removed drivers/net/sk98lin/skrlmt.c Removed drivers/net/sk98lin/sktimer.c Removed drivers/net/sk98lin/skvpd.c Removed drivers/net/sk98lin/skxmac2.c Removed drivers/net/tulip/xircom_tulip_cb.c Removed drivers/net/wireless/bcm43xx/Kconfig Removed drivers/net/wireless/bcm43xx/Makefile Removed drivers/net/wireless/bcm43xx/bcm43xx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.c Removed drivers/net/wireless/bcm43xx/bcm43xx_dma.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.c Removed drivers/net/wireless/bcm43xx/bcm43xx_ilt.h Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.c Removed drivers/net/wireless/bcm43xx/bcm43xx_leds.h Removed drivers/net/wireless/bcm43xx/bcm43xx_main.c Removed drivers/net/wireless/bcm43xx/bcm43xx_main.h Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.c Removed drivers/net/wireless/bcm43xx/bcm43xx_phy.h Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_pio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_power.c Removed drivers/net/wireless/bcm43xx/bcm43xx_power.h Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.c Removed drivers/net/wireless/bcm43xx/bcm43xx_radio.h Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c Removed drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.c Removed drivers/net/wireless/bcm43xx/bcm43xx_wx.h Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.c Removed drivers/net/wireless/bcm43xx/bcm43xx_xmit.h Removed drivers/net/wireless/rt2x00/rt2x00ring.h Removed drivers/s390/net/ctcdbug.c Removed drivers/s390/net/ctcdbug.h Removed drivers/s390/net/ctcmain.c Removed drivers/s390/net/ctcmain.h Removed drivers/s390/net/qeth_fs.h Removed drivers/s390/net/qeth_main.c Removed drivers/s390/net/qeth_mpc.c Removed drivers/s390/net/qeth_proc.c Removed drivers/s390/net/qeth_sys.c Removed drivers/s390/net/qeth_tso.h Removed include/net/ieee80211softmac.h Removed include/net/ieee80211softmac_wx.h Auto-merged net/core/sock.c Removed net/ieee80211/softmac/Kconfig Removed net/ieee80211/softmac/Makefile Removed net/ieee80211/softmac/ieee80211softmac_assoc.c Removed net/ieee80211/softmac/ieee80211softmac_auth.c Removed net/ieee80211/softmac/ieee80211softmac_event.c Removed net/ieee80211/softmac/ieee80211softmac_io.c Removed net/ieee80211/softmac/ieee80211softmac_module.c Removed net/ieee80211/softmac/ieee80211softmac_priv.h Removed net/ieee80211/softmac/ieee80211softmac_scan.c Removed net/ieee80211/softmac/ieee80211softmac_wx.c Removed net/mac80211/rc80211_simple.c Removed net/mac80211/regdomain.c Created commit 179c647: Resolve Patch: /home/jejb/net-fixup.diff ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Auto-merged fs/nfs/super.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/clnt.c Auto-merged net/sunrpc/rpcb_clnt.c Auto-merged net/sunrpc/xprtsock.c Merge made by recursive. fs/Kconfig | 70 +++++------ fs/lockd/host.c | 20 ++-- fs/lockd/mon.c | 113 +++++++++++++---- fs/lockd/svc.c | 12 ++ fs/nfs/Makefile | 3 +- fs/nfs/client.c | 16 +++ fs/nfs/dir.c | 2 +- fs/nfs/direct.c | 9 +- fs/nfs/file.c | 6 - fs/nfs/inode.c | 45 +++++++- fs/nfs/internal.h | 13 +-- fs/nfs/nfs2xdr.c | 37 +++++-- fs/nfs/nfs3xdr.c | 37 +++++-- fs/nfs/nfs4proc.c | 18 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/nfs4xdr.c | 39 +++++-- fs/nfs/read.c | 18 +-- fs/nfs/super.c | 130 +++++++++++++------- fs/nfs/unlink.c | 2 +- fs/nfs/write.c | 86 +++++++------ include/linux/lockd/lockd.h | 17 ++-- include/linux/lockd/sm_inter.h | 1 + include/linux/nfs_fs_sb.h | 8 ++ include/linux/sunrpc/auth.h | 13 ++- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/Makefile | 2 +- net/sunrpc/auth.c | 63 ++++++---- net/sunrpc/auth_generic.c | 157 ++++++++++++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 7 +- net/sunrpc/auth_null.c | 1 + net/sunrpc/auth_unix.c | 57 ++++----- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 264 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 37 files changed, 888 insertions(+), 498 deletions(-) create mode 100644 net/sunrpc/auth_generic.c ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Already up-to-date. ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## Auto-merged arch/s390/defconfig Auto-merged fs/Kconfig Auto-merged kernel/sched.c Merge made by recursive. arch/s390/Kconfig | 4 + arch/s390/defconfig | 4 +- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/compat_signal.c | 10 + arch/s390/kernel/early.c | 14 ++ arch/s390/kernel/head64.S | 12 ++- arch/s390/kernel/setup.c | 32 ++-- arch/s390/kernel/signal.c | 10 + arch/s390/kernel/smp.c | 87 +++++++++- arch/s390/kernel/time.c | 2 +- arch/s390/kernel/topology.c | 316 +++++++++++++++++++++++++++++++++++ arch/s390/mm/Makefile | 2 +- arch/s390/mm/fault.c | 3 + arch/s390/mm/hugetlbpage.c | 134 +++++++++++++++ arch/s390/mm/init.c | 23 --- arch/s390/mm/vmem.c | 55 ++++++- drivers/base/topology.c | 17 +- drivers/char/hw_random/core.c | 4 + drivers/crypto/Kconfig | 1 + drivers/s390/block/Kconfig | 1 + drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_3990_erp.c | 34 ++++ drivers/s390/block/dasd_eckd.c | 7 + drivers/s390/block/dasd_int.h | 6 + drivers/s390/cio/chsc.c | 12 +- drivers/s390/cio/css.c | 5 + drivers/s390/cio/css.h | 1 + drivers/s390/crypto/zcrypt_api.c | 120 +++++++++++++ drivers/s390/crypto/zcrypt_api.h | 8 + drivers/s390/crypto/zcrypt_pcixcc.c | 199 ++++++++++++++++++++++- drivers/s390/sysinfo.c | 116 ++----------- fs/Kconfig | 3 +- include/asm-s390/page.h | 29 +++- include/asm-s390/pgtable.h | 158 +++++++++++++++++ include/asm-s390/setup.h | 4 + include/asm-s390/smp.h | 3 + include/asm-s390/sysinfo.h | 117 +++++++++++++ include/asm-s390/system.h | 12 ++ include/asm-s390/timex.h | 12 +- include/asm-s390/tlbflush.h | 34 +++-- include/asm-s390/topology.h | 25 +++ include/linux/hugetlb.h | 22 +++ mm/hugetlb.c | 37 +++-- 43 files changed, 1494 insertions(+), 204 deletions(-) create mode 100644 arch/s390/kernel/topology.c create mode 100644 arch/s390/mm/hugetlbpage.c create mode 100644 include/asm-s390/sysinfo.h ## # git git://git.o-hand.com/linux-rpurdie-backlight for-linus backlight ## Already up-to-date. ## # git git://git.infradead.org/battery-2.6 master battery ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/mfasheh/ocfs2.git ALL ocfs2 ## Auto-merged Documentation/feature-removal-schedule.txt Auto-merged MAINTAINERS Auto-merged fs/Kconfig Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 11 + MAINTAINERS | 1 + fs/Kconfig | 26 + fs/ocfs2/Makefile | 14 +- fs/ocfs2/alloc.c | 465 +++++++++++++-- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 51 ++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dlm/dlmcommon.h | 49 ++ fs/ocfs2/dlm/dlmdebug.c | 911 +++++++++++++++++++++++++--- fs/ocfs2/dlm/dlmdebug.h | 86 +++ fs/ocfs2/dlm/dlmdomain.c | 70 ++- fs/ocfs2/dlm/dlmlock.c | 22 +- fs/ocfs2/dlm/dlmmaster.c | 200 ++----- fs/ocfs2/dlmglue.c | 645 ++++++++++++-------- fs/ocfs2/dlmglue.h | 5 +- fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 184 +------ fs/ocfs2/heartbeat.h | 17 +- fs/ocfs2/ioctl.c | 13 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/journal.c | 211 ++++++- fs/ocfs2/journal.h | 4 + fs/ocfs2/localalloc.c | 4 + fs/ocfs2/namei.c | 4 +- fs/ocfs2/ocfs2.h | 77 ++- fs/ocfs2/ocfs2_fs.h | 79 +++- fs/ocfs2/ocfs2_lockid.h | 2 +- fs/ocfs2/slot_map.c | 454 +++++++++++--- fs/ocfs2/slot_map.h | 32 +- fs/ocfs2/stack_o2cb.c | 420 +++++++++++++ fs/ocfs2/stack_user.c | 883 +++++++++++++++++++++++++++ fs/ocfs2/stackglue.c | 568 +++++++++++++++++ fs/ocfs2/stackglue.h | 261 ++++++++ fs/ocfs2/suballoc.c | 103 +++- fs/ocfs2/suballoc.h | 1 + fs/ocfs2/super.c | 208 ++++--- fs/sysfs/symlink.c | 9 +- 40 files changed, 5120 insertions(+), 1009 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb create mode 100644 fs/ocfs2/dlm/dlmdebug.h create mode 100644 fs/ocfs2/stack_o2cb.c create mode 100644 fs/ocfs2/stack_user.c create mode 100644 fs/ocfs2/stackglue.c create mode 100644 fs/ocfs2/stackglue.h ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-akpm selinux ## Auto-merged security/commoncap.c Auto-merged security/security.c Auto-merged security/selinux/hooks.c Auto-merged security/selinux/include/security.h Merge made by recursive. security/commoncap.c | 4 +- security/keys/internal.h | 8 +- security/root_plug.c | 2 +- security/security.c | 8 +- security/selinux/avc.c | 4 +- security/selinux/hooks.c | 64 ++++++++++++++------ security/selinux/include/av_perm_to_string.h | 5 ++ security/selinux/include/av_permissions.h | 5 ++ security/selinux/include/netlabel.h | 16 ----- security/selinux/include/objsec.h | 8 --- security/selinux/include/security.h | 2 + security/selinux/netlabel.c | 82 +++++--------------------- security/selinux/netlink.c | 2 +- security/selinux/selinuxfs.c | 11 ++-- security/selinux/ss/avtab.c | 40 ++++++------ security/selinux/ss/conditional.c | 16 +++--- security/selinux/ss/ebitmap.c | 14 ++-- security/selinux/ss/policydb.c | 54 +++++++++--------- security/selinux/ss/services.c | 35 ++++++----- 19 files changed, 174 insertions(+), 206 deletions(-) ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # gitfetch /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## ## # merge sh resolve /home/jejb/sh-fixup.diff ## Auto-merged arch/sh/Kconfig CONFLICT (content): Merge conflict in arch/sh/Kconfig Auto-merged arch/sh/Makefile Created commit 0d1305b: Resolve Patch: /home/jejb/sh-fixup.diff ## # git /pub/scm/linux/kernel/git/ericvh/v9fs for-linus v9fs ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/ericvh/v9fs v9fs-devel v9fs-devel ## Auto-merged net/9p/error.c Merge made by recursive. fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 52 ++++++++-- fs/9p/v9fs.h | 85 +++++++++++----- fs/9p/vfs_addr.c | 2 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 11 +- fs/9p/vfs_inode.c | 50 +++++++--- fs/9p/vfs_super.c | 1 + include/linux/parser.h | 2 +- include/net/9p/9p.h | 239 ++++++++++++++++++++++++++++++++++++++------ include/net/9p/client.h | 35 +++++++ include/net/9p/transport.h | 43 ++++++++ lib/parser.c | 32 ++++-- net/9p/client.c | 32 +++++-- net/9p/conv.c | 128 +++++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 175 +++++++++++++++++++++++++++------ net/9p/trans_virtio.c | 173 ++++++++++++++++++++++++++++---- net/9p/util.c | 32 +++++- 21 files changed, 966 insertions(+), 169 deletions(-) ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # git git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## Auto-merged fs/xfs/xfs_iget.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 4 +- fs/xfs/linux-2.6/xfs_export.c | 11 +- fs/xfs/linux-2.6/xfs_file.c | 13 +- fs/xfs/linux-2.6/xfs_fs_subr.c | 36 +-- fs/xfs/linux-2.6/xfs_ioctl.c | 562 +++++++++++++++------------------- fs/xfs/linux-2.6/xfs_iops.c | 180 ++++++------ fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 53 ++-- fs/xfs/linux-2.6/xfs_super.c | 3 +- fs/xfs/linux-2.6/xfs_vnode.h | 19 +- fs/xfs/quota/xfs_qm.c | 6 +- fs/xfs/quota/xfs_qm_bhv.c | 2 +- fs/xfs/quota/xfs_qm_syscalls.c | 4 +- fs/xfs/support/ktrace.c | 37 ++-- fs/xfs/support/ktrace.h | 3 +- fs/xfs/xfs_attr_leaf.c | 6 +- fs/xfs/xfs_bmap.c | 26 +- fs/xfs/xfs_bmap_btree.h | 2 +- fs/xfs/xfs_dir2.c | 2 +- fs/xfs/xfs_fsops.c | 24 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_iget.c | 49 +--- fs/xfs/xfs_inode.c | 661 ++++++++++++++++++++-------------------- fs/xfs/xfs_inode.h | 23 +-- fs/xfs/xfs_inode_item.c | 4 +- fs/xfs/xfs_inode_item.h | 8 + fs/xfs/xfs_itable.c | 5 +- fs/xfs/xfs_log.c | 61 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 19 +- fs/xfs/xfs_mount.c | 49 ++- fs/xfs/xfs_mount.h | 24 +- fs/xfs/xfs_rename.c | 45 +-- fs/xfs/xfs_sb.h | 106 +++---- fs/xfs/xfs_trans.h | 1 - fs/xfs/xfs_trans_buf.c | 3 +- fs/xfs/xfs_utils.c | 28 +-- fs/xfs/xfs_utils.h | 1 - fs/xfs/xfs_vfsops.c | 38 +-- fs/xfs/xfs_vnodeops.c | 328 ++++++--------------- fs/xfs/xfs_vnodeops.h | 14 +- 41 files changed, 1042 insertions(+), 1431 deletions(-) ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Removed arch/xtensa/boot/ramdisk/Makefile Merge made by recursive. arch/xtensa/Kconfig | 65 ++++++++++++++++++++++++----------- arch/xtensa/Makefile | 68 +++++++++++++----------------------- arch/xtensa/boot/ramdisk/Makefile | 23 ------------ arch/xtensa/configs/iss_defconfig | 2 + arch/xtensa/mm/init.c | 1 - 5 files changed, 71 insertions(+), 88 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # gitfetch /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## ## # revert e14b8e9dd704ad37756c0a9ab14c7ccb1e398028 x86 ## Removed localversion-x86-latest.git Created commit b9a2c1b: Revert "x86: add x86-latest.git tag" 1 files changed, 0 insertions(+), 1 deletions(-) delete mode 100644 localversion-x86-latest.git ## # merge x86 resolve /home/jejb/x86-fixup.diff ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/arm/Kconfig Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/reboot.c Auto-merged arch/x86/kernel/setup_32.c Auto-merged arch/x86/kernel/setup_64.c Removed arch/x86/kernel/smp_32.c Removed arch/x86/kernel/smp_64.c Removed arch/x86/kernel/smpboot_64.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Removed arch/x86/lib/bitops_32.c Removed arch/x86/mach-rdc321x/wdt.c Removed arch/x86/mm/Makefile_32 Removed arch/x86/mm/Makefile_64 Auto-merged arch/x86/pci/acpi.c CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c Auto-merged arch/x86/pci/common.c Auto-merged arch/x86/pci/i386.c Auto-merged arch/x86/pci/pci.h CONFLICT (content): Merge conflict in arch/x86/pci/pci.h Auto-merged drivers/base/core.c Auto-merged drivers/misc/Makefile Auto-merged drivers/pci/pci-sysfs.c Auto-merged drivers/pci/probe.c Auto-merged drivers/serial/serial_core.c Removed include/asm-x86/mach-default/mach_reboot.h Removed include/asm-x86/nmi_32.h Removed include/asm-x86/nmi_64.h Removed include/asm-x86/pgalloc_32.h Removed include/asm-x86/pgalloc_64.h Auto-merged include/linux/ide.h Auto-merged include/linux/kernel.h Auto-merged include/linux/netdevice.h Auto-merged include/linux/pci.h Auto-merged include/linux/skbuff.h Auto-merged include/net/inet_sock.h Auto-merged include/net/tcp.h Auto-merged init/main.c Auto-merged lib/Kconfig.debug Created commit 307ecb1: Resolve Patch: /home/jejb/x86-fixup.diff ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ doc ## 2.6.25-rc5-git2 to baadac8b10c5ac15ce3d26b68fa266c8889b163f Using base baadac8b10c5ac15ce3d26b68fa266c8889b163f docbook-audit-prms.patch docsrc-spi-split-fix.patch kconfig_allconfig_docv2.patch move-smart-config.patch kerndoc-dup-section-name-err.patch ## # merge doc ## Auto-merged Documentation/00-INDEX Auto-merged kernel/audit.c Auto-merged scripts/kernel-doc Merge made by recursive. Documentation/00-INDEX | 2 - Documentation/kbuild/00-INDEX | 4 + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++ Documentation/{ => kbuild}/smart-config.txt | 2 +- Documentation/spi/spidev | 168 +----------------------- Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++ README | 32 +++-- kernel/audit.c | 4 +- scripts/kernel-doc | 20 ++- 9 files changed, 388 insertions(+), 190 deletions(-) create mode 100644 Documentation/kbuild/make-configs.txt rename Documentation/{ => kbuild}/smart-config.txt (99%) create mode 100644 Documentation/spi/spidev_fdx.c ## # git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git testing lm-sensors ## Merge made by recursive. Documentation/hwmon/w83l785ts | 3 +- drivers/hwmon/adm1026.c | 22 ++++++--- drivers/hwmon/adm1029.c | 30 ++++++++----- drivers/hwmon/adm1031.c | 20 ++++++-- drivers/hwmon/adm9240.c | 20 ++++++--- drivers/hwmon/adt7470.c | 40 ++++++++++------- drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ drivers/hwmon/asb100.c | 20 +++++--- drivers/hwmon/dme1737.c | 5 ++ drivers/hwmon/f71805f.c | 5 ++ drivers/hwmon/f71882fg.c | 5 ++ drivers/hwmon/it87.c | 5 ++ drivers/hwmon/lm75.c | 5 +-- drivers/hwmon/pc87360.c | 6 +++ drivers/hwmon/pc87427.c | 5 ++ drivers/hwmon/sis5595.c | 5 ++ drivers/hwmon/smsc47b397.c | 22 ++++++++- drivers/hwmon/smsc47m1.c | 5 ++ drivers/hwmon/via686a.c | 5 ++ drivers/hwmon/vt1211.c | 5 ++ drivers/hwmon/vt8231.c | 5 ++ drivers/hwmon/w83627ehf.c | 6 +++ drivers/hwmon/w83627hf.c | 5 ++ drivers/hwmon/w83793.c | 26 ++++++----- drivers/hwmon/w83l785ts.c | 4 +- 25 files changed, 257 insertions(+), 121 deletions(-) ## # git git://git.infradead.org/~dedekind/ubi-2.6.git master ubi ## Merge made by recursive. Documentation/ABI/stable/sysfs-class-ubi | 212 ++++++++++++++++++++ drivers/mtd/ubi/build.c | 18 +- drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 4 + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- drivers/mtd/ubi/ubi.h | 3 +- include/mtd/Kbuild | 1 - 7 files changed, 231 insertions(+), 17 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-ubi rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) ## # git /pub/scm/linux/kernel/git/teigland/dlm.git next dlm ## Merge made by recursive. fs/dlm/config.c | 2 +- fs/dlm/lock.c | 5 ++--- fs/dlm/lock.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/kyle/parisc-2.6.git master parisc ## Merge made by recursive. arch/parisc/kernel/signal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus blackfinquilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ m68k ## Already up-to-date. ## # merge m68k ## MERGE m68k not in tree, SKIPPING ## # git /pub/scm/linux/kernel/git/tytso/ext4.git next ext4 ## Merge made by recursive. fs/ext4/balloc.c | 29 +++++-- fs/ext4/dir.c | 2 +- fs/ext4/extents.c | 203 +++++++++++++++++++++++++++++++++++++++++--- fs/ext4/file.c | 21 ++++- fs/ext4/fsync.c | 3 + fs/ext4/ialloc.c | 112 ++++++++++++++++++++++-- fs/ext4/inode.c | 35 ++++---- fs/ext4/ioctl.c | 12 +-- fs/ext4/mballoc.c | 63 ++++++-------- fs/ext4/namei.c | 11 ++- fs/ext4/resize.c | 6 +- fs/ext4/super.c | 63 +++++++++++++- fs/ext4/xattr.c | 16 ++-- fs/ext4/xattr.h | 7 -- fs/jbd2/commit.c | 19 +---- fs/jbd2/journal.c | 13 ++-- fs/jbd2/revoke.c | 4 +- fs/jbd2/transaction.c | 34 +++++++- include/linux/ext4_fs.h | 29 ++++++- include/linux/ext4_fs_sb.h | 3 + 20 files changed, 534 insertions(+), 151 deletions(-) ## # git /pub/scm/linux/kernel/git/jack/linux-udf-2.6.git for_next udf ## Auto-merged include/linux/Kbuild Removed include/linux/udf_fs.h Removed include/linux/udf_fs_sb.h Merge made by recursive. fs/udf/balloc.c | 13 +- fs/udf/crc.c | 4 +- fs/udf/dir.c | 83 ++---- fs/udf/ecma_167.h | 13 - fs/udf/file.c | 47 --- fs/udf/ialloc.c