From /pub/scm/linux/kernel/git/torvalds/linux-2.6 d395991..038f2f7 master -> linus Switched to branch "2.6.25-rc3-mc10" Switched to branch "ide" Context reduced to (2/2) to apply fragment at 273 Context reduced to (2/2) to apply fragment at 444 Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" fatal: Not a valid object name: '2.6.25-rc3'. Switched to branch "gregkh-driver" .dotest/patch:1896: space before tab in indent. 0xd3), .dotest/patch:1911: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:1915: space before tab in indent. GO7007_SENSOR_TV) && .dotest/patch:2125: space before tab in indent. (1 << 14) | (1 << 9) : 0) | .dotest/patch:2128: space before tab in indent. GO7007_SENSOR_CONFIG_MASK), warning: 5 lines add whitespace errors. Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" remote: Counting objects: 1 remote: Counting objects: 4, done. remote: Compressing objects: 50% (1/2) remote: Compressing objects: 100% (2/2) remote: Compressing objects: 100% (2/2), done. remote: Total 2 (delta 1), reused 0 (delta 0) From /pub/scm/linux/kernel/git/sfrench/cifs-2.6 0dbd888..41c5ae6 master -> cifs Switched to branch "i2c" Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" fatal: Not a valid object name: '2.6.25-rc3'. Switched to branch "doc" Switched to branch "2.6.25-rc3-mc10" Already on branch "2.6.25-rc3-mc10" remote: Generating pack... remote: Counting objects...1 remote: Done counting 118 objects. remote: Result has 60 objects. remote: Deltifying 60 objects. remote: 1% (1/60) done remote: 3% (2/60) done remote: 5% (3/60) done remote: 6% (4/60) done remote: 8% (5/60) done remote: 10% (6/60) done remote: 11% (7/60) done remote: 13% (8/60) done remote: 15% (9/60) done remote: 16% (10/60) done remote: 18% (11/60) done remote: 20% (12/60) done remote: 21% (13/60) done remote: 23% (14/60) done remote: 25% (15/60) done remote: 26% (16/60) done remote: 28% (17/60) done remote: 30% (18/60) done remote: 31% (19/60) done remote: 33% (20/60) done remote: 35% (21/60) done remote: 36% (22/60) done remote: 38% (23/60) done remote: 40% (24/60) done remote: 41% (25/60) done remote: 43% (26/60) done remote: 45% (27/60) done remote: 46% (28/60) done remote: 48% (29/60) done remote: 50% (30/60) done remote: 51% (31/60) done remote: 53% (32/60) done remote: 55% (33/60) done remote: 56% (34/60) done remote: 58% (35/60) done remote: 60% (36/60) done remote: 61% (37/60) done remote: 63% (38/60) done remote: 65% (39/60) done remote: 66% (40/60) done remote: 68% (41/60) done remote: 70% (42/60) done remote: 71% (43/60) done remote: 73% (44/60) done remote: 75% (45/60) done remote: 76% (46/60) done remote: 78% (47/60) done remote: 80% (48/60) done remote: 81% (49/60) done remote: 83% (50/60) done remote: 85% (51/60) done remote: 86% (52/60) done remote: 88% (53/60) done remote: 90% (54/60) done remote: 91% (55/60) done remote: 93% (56/60) done remote: 95% (57/60) done remote: 96% (58/60) done remote: 98% (59/60) done remote: 100% (60/60) done remote: remote: Total 60 (delta 52), reused 4 (delta 3) From git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 + b784952...f18f046 testing -> lm-sensors (forced update) Already on branch "2.6.25-rc3-mc10" ixes-to-drivers_ide_setup-pci-c.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-factor-out-cable-detection-from-ide_init_port.patch ide-factor-out-devices-init-from-ide_init_port_data.patch ide-factor-out-unregistering-devices-from-ide_unregister.patch ide-fix-enabling-dma-on-it821x-in-smart-mode.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.patch ide-merge-ide_match_hwif-and-ide_find_port.patch ide-move-default-ide-ports-setup-to-ide_generic-host-driver.patch ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch ide-pmac-dynamically-allocate-struct-pmac_ide_hwif-instances-take-2.patch ide-pmac-remove-dead-code.patch ide-pmac-use-ide_find_port.patch ide-pnp-manage-io-resources-in-driver.patch ide-register-ports-with-non-present-devices-for-warm-plug.patch ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-3.patch ide-remove-config_blk_dev_hd_ide-config-option.patch ide-remove-config_ide_arch_obsolete_init.patch ide-remove-dead-obsolete-busproc-method.patch ide-remove-hold-field-from-ide_hwif_t-take-2.patch ide-remove-hwif-straight8-flag.patch ide-remove-ide_-_reg-macros.patch ide-remove-ide_default_io_ctl-macro.patch ide-remove-ide_hflag_cy82c693-host-flag.patch ide-remove-ide_hwif_release_regions.patch ide-remove-ide_hwif_request_regions.patch ide-remove-ide_init_default_irq-macro.patch ide-remove-ide_init_hwif_ports.patch ide-remove-init_hwif_default.patch ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch ide-remove-needless-hwif-irq-check-from-ide_hwif_configure.patch ide-remove-noprobe-field-from-ide_hwif_t.patch ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch ide-remove-obsoleted-idex-noprobe-kernel-parameter.patch ide-remove-pio-downgrade-quirk.patch ide-remove-ppc-ifdef-from-init_ide_data.patch ide-rework-powermac-media-bay-support-take-2.patch ide-sanitize-handling-of-ide_hflag_no_set_mode-host-flag.patch ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch ide-scsi-do-non-atomic-pc-flags-testing.patch ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch ide-tape-move-all-struct-and-other-defs-at-the-top.patch ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch ide-tape-remove-idetape_pipeline_active.patch ide-unexport-ide_hwifs.patch ide-use-div_round_up.patch ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch ide-use-ide_find_port-in-legacy-vlb-host-drivers-take-2.patch ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch ide-use-ide_legacy_device_add-for-qd65xx-take-2.patch ide_arm-manage-io-resources-in-driver.patch ide_platform-fix-resources-handling.patch it821x-fix-kzalloc-failure-handling.patch mpc8xx-fix-resources-reservation.patch mpc8xx-make-m8xx_ide_init_ports-return-an-error-value.patch ppc-dont-include-linux-ide-h.patch ppc-hdpu-remove-dead-ide-code.patch ppc-lopec-remove-ppc_ide_md-hooks.patch ppc-mpc8xx-remove-ppc_ide_md-hooks.patch ppc-pmac-remove-no-longer-needed-ide-quirk.patch ppc-pmac-remove-ppc_ide_md-hooks.patch ppc-ppc4xx-remove-ppc_ide_md-hooks.patch ppc-pplus-remove-ppc_ide_md-ide_init_hwif-hook.patch ppc-remove-ppc_ide_md-ide_init_hwif-hook.patch ppc-sandpoint-remove-ppc_ide_md-hooks.patch qd65xx-cleanup-qd_probe.patch qd65xx-return-error-value-in-qd_probe.patch qd65xx-selectproc-method-needs-to-be-always-used.patch qd65xx-use-ide_hflag_single-host-flag.patch remove-include-linux-hdsmart-h.patch scc_pata-store-hwif-pointer-in-struct-scc_ports.patch series sgiioc4-use-ide_find_port.patch sis5513-fail-early-for-unsupported-chipsets.patch swarm-use-ide_find_port.patch umc8672-dont-use-ide_hwifs-in-umc_set_pio_mode.patch sent 778471 bytes received 3062 bytes 223295.14 bytes/sec total size is 762180 speedup is 0.98 Using base d395991c117d43bfca97101a931a41d062a93852 ide-generic-set-hwif-chipset.patch ide-fix-ide_find_port.patch ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch ide-acpi-add-missing-drive-acpidata-zeroing.patch ide-factor-out-cable-detection-from-ide_init_port.patch ide-factor-out-unregistering-devices-from-ide_unregister.patch ide-factor-out-devices-init-from-ide_init_port_data.patch ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch ide-rework-powermac-media-bay-support-take-2.patch ide-remove-dead-obsolete-busproc-method.patch ide-add-warm-plug-support-for-ide-devices.patch ide-add-ide_generic-class-and-attribute-for-adding-new-interfaces.patch ide-remove-needless-config_blk_dev_hd-hack-from-init_hwif.patch ide-remove-config_blk_dev_hd_ide-config-option.patch ide-remove-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-3.patch ide-remove-hold-field-from-ide_hwif_t-take-2.patch ide-remove-init_hwif_default.patch ide-remove-ide_init_hwif_ports.patch ide-floppy-remove-struct-idefloppy_id_gcw.patch ide-add-ide_atapi_discard_data-write_zeros-inline-helpers.patch ide-remove-ide_-_reg-macros.patch ide-tape-move-all-struct-and-other-defs-at-the-top.patch ide-tape-remove-atomic-test_set-macros-for-packet-commands.patch ide-add-generic-packet-command-representation-ide_atapi_pc.patch ide-tape-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-convert-driver-to-using-generic-ide_atapi_pc.patch ide-scsi-convert-driver-to-using-generic-ide_atapi_pc.patch ide-floppy-rename-end_request-handler-properly.patch ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch ide-scsi-do-non-atomic-pc-flags-testing.patch ide-pmac-remove-dead-code.patch ppc-hdpu-remove-dead-ide-code.patch ppc-ppc4xx-remove-ppc_ide_md-hooks.patch ppc-pmac-remove-ppc_ide_md-hooks.patch ppc-mpc8xx-remove-ppc_ide_md-hooks.patch ppc-lopec-remove-ppc_ide_md-hooks.patch ppc-sandpoint-remove-ppc_ide_md-hooks.patch ppc-pplus-remove-ppc_ide_md-ide_init_hwif-hook.patch ppc-remove-ppc_ide_md-ide_init_hwif-hook.patch ppc-dont-include-linux-ide-h.patch ppc-pmac-remove-no-longer-needed-ide-quirk.patch ide-add-config_ide_arch_obsolete_defaults-take-2.patch ide-remove-config_ide_arch_obsolete_init.patch ide-remove-ide_default_io_ctl-macro.patch ide-remove-ppc-ifdef-from-init_ide_data.patch ide-add-ide-4drives-host-driver-take-3.patch cmd640-cleanup-setup_device_ptrs.patch cmd640-init-hwif-io_ports-irq-explicitly.patch ide-limit-legacy-vlb-host-drivers-to-alpha-x86-and-mips.patch ide-init-hwif-io_ports-irq-explicitly-in-legacy-vlb-host-drivers.patch ide-remove-needless-hwif-irq-check-from-ide_hwif_configure.patch ide-remove-obsoleted-idex-noprobe-kernel-parameter.patch ide-move-default-ide-ports-setup-to-ide_generic-host-driver.patch ide-remove-ide_init_default_irq-macro.patch ide-cleanup-ide_match_hwif.patch ide-cleanup-ide_find_port.patch swarm-use-ide_find_port.patch ide-pmac-dynamically-allocate-struct-pmac_ide_hwif-instances-take-2.patch ide-pmac-use-ide_find_port.patch sgiioc4-use-ide_find_port.patch au1xxx-ide-use-ide_find_port.patch cmd640-remove-cmd_drives.patch cmd640-use-ide_find_port.patch scc_pata-store-hwif-pointer-in-struct-scc_ports.patch umc8672-dont-use-ide_hwifs-in-umc_set_pio_mode.patch ht6560b-use-driver-name-for-resource-allocation.patch qd65xx-return-error-value-in-qd_probe.patch ide-ide_hflag_bootable-to-ide_hflag_non_bootable.patch ide-use-div_round_up.patch ide-remove-pio-downgrade-quirk.patch ide-merge-ide_match_hwif-and-ide_find_port.patch ide-use-ide_find_port-in-legacy-vlb-host-drivers-take-2.patch ide-generic-use-ide_find_port-take-3.patch ide-unexport-ide_hwifs.patch ide-disk-add-proc_idedisk_read_smart-helper.patch ide-disk-fix-issues-found-by-checkpatch-pl.patch ide-cd-remove-the-internal-64k-buffer.patch remove-include-linux-hdsmart-h.patch ide_platform-fix-resources-handling.patch delkin_cb-fix-resources-handling.patch bast-ide-fix-resources-reservation.patch mpc8xx-make-m8xx_ide_init_ports-return-an-error-value.patch mpc8xx-fix-resources-reservation.patch falconide-fix-resources-reservation-take-2.patch ide-fix-enabling-dma-on-it821x-in-smart-mode.patch ide-remove-ide_hflag_cy82c693-host-flag.patch ide-remove-hwif-straight8-flag.patch ide-coding-style-fixes-to-drivers_ide_setup-pci-c.patch ide-coding-style-fixes-to-drivers_ide_pci_tc86c001-c.patch ide-coding-style-fixes-to-drivers_ide_pci_slc90e66-c.patch ide-coding-style-fixes-to-drivers_ide_pci_sis5513-c.patch ide-coding-style-fixes-to-drivers_ide_pci_jmicron-c.patch ide-coding-style-fixes-to-drivers_ide_pci_generic-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_umc8672-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_ide-4drives-c.patch ide-coding-style-fixes-to-drivers_ide_ide-proc-c.patch ide-coding-style-fixes-to-drivers_ide_ide-pnp-c.patch ide-coding-style-fixes-to-drivers_ide_pci_opti621-c.patch ide-coding-style-fixes-to-drivers_ide_pci_cmd640-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_hd-c.patch ide-coding-style-fixes-to-drivers_ide_legacy_ali14xx-c.patch ide-coding-style-fixes-to-drivers_ide_ide-floppy-c.patch ide-coding-style-fixes-to-drivers_ide_pci_it8213-c.patch ide-coding-style-fixes-to-drivers_ide_pci_cy82c693-c.patch ide-coding-style-fixes-to-drivers_ide_ide-cd-c.patch ide-cd-replace-__function__-with-__func__.patch ide-cd-put-proc-related-functions-together-under-single-ifdef.patch qd65xx-selectproc-method-needs-to-be-always-used.patch qd65xx-use-ide_hflag_single-host-flag.patch it821x-fix-kzalloc-failure-handling.patch sis5513-fail-early-for-unsupported-chipsets.patch ide-sanitize-handling-of-ide_hflag_no_set_mode-host-flag.patch ide-add-struct-ide_port_ops.patch ide-cd-include-proper-headers.patch ide-cd-put-all-proc-related-code-at-one-place.patch ide-cd-fixup-comments.patch ide-cd-shorten-lines-longer-than-80-columns.patch ide-cd-fix-remaining-checkpatch-pl-issues.patch ide-remove-noprobe-field-from-ide_hwif_t.patch ide-add-ide_legacy_device_add-helper.patch ide-use-ide_legacy_device_add-for-qd65xx-take-2.patch qd65xx-cleanup-qd_probe.patch ide-pnp-manage-io-resources-in-driver.patch ide-cs-manage-io-resources-in-driver.patch ide-register-ports-with-non-present-devices-for-warm-plug.patch ide-remove-ide_hwif_release_regions.patch ide-generic-manage-io-resources-in-driver.patch ide-4drives-manage-io-resources-in-driver.patch ide_arm-manage-io-resources-in-driver.patch ide-add-ide_legacy_init_one-helper.patch ide-manage-io-resources-in-ide_legacy_init_one.patch cmd640-manage-io-resources-in-driver ide-manage-resources-for-pci-devices-in-ide_pci_enable.patch ide-remove-ide_hwif_request_regions.patch ide-cleanup-setting-hwif-mmio-flag.patch ide-tape-remove-idetape_pipeline_active.patch ## # merge ide ## Removed include/linux/hdsmart.h Merge made by recursive. Documentation/ide.txt | 36 +-- Documentation/ide/warm-plug-howto.txt | 13 + arch/powerpc/kernel/setup_32.c | 8 - arch/powerpc/platforms/powermac/pci.c | 22 - arch/powerpc/platforms/powermac/pmac.h | 5 - arch/powerpc/platforms/powermac/setup.c | 8 - arch/ppc/configs/sandpoint_defconfig | 2 +- arch/ppc/kernel/ppc_ksyms.c | 5 - arch/ppc/kernel/setup.c | 2 - arch/ppc/platforms/4xx/bamboo.c | 1 - arch/ppc/platforms/4xx/ebony.c | 1 - arch/ppc/platforms/4xx/luan.c | 1 - arch/ppc/platforms/4xx/ocotea.c | 1 - arch/ppc/platforms/4xx/taishan.c | 1 - arch/ppc/platforms/4xx/yucca.c | 1 - arch/ppc/platforms/chestnut.c | 1 - arch/ppc/platforms/cpci690.c | 1 - arch/ppc/platforms/ev64260.c | 1 - arch/ppc/platforms/hdpu.c | 36 -- arch/ppc/platforms/lopec.c | 85 --- arch/ppc/platforms/mvme5100.c | 1 - arch/ppc/platforms/powerpmc250.c | 1 - arch/ppc/platforms/pplus.c | 58 -- arch/ppc/platforms/prep_setup.c | 38 -- arch/ppc/platforms/prpmc750.c | 1 - arch/ppc/platforms/prpmc800.c | 1 - arch/ppc/platforms/radstone_ppc7d.c | 1 - arch/ppc/platforms/residual.c | 1 - arch/ppc/platforms/sandpoint.c | 94 ---- arch/ppc/platforms/sandpoint.h | 3 - arch/ppc/platforms/spruce.c | 1 - arch/ppc/syslib/m8xx_setup.c | 6 - arch/ppc/syslib/ppc4xx_setup.c | 23 - block/compat_ioctl.c | 1 - drivers/ide/Kconfig | 35 +- drivers/ide/Makefile | 2 +- drivers/ide/arm/bast-ide.c | 15 +- drivers/ide/arm/icside.c | 17 +- drivers/ide/arm/ide_arm.c | 20 +- drivers/ide/arm/palm_bk3710.c | 44 +- drivers/ide/arm/rapide.c | 5 +- drivers/ide/cris/ide-cris.c | 30 +- drivers/ide/h8300/ide-h8300.c | 4 +- drivers/ide/ide-acpi.c | 2 + drivers/ide/ide-cd.c | 913 ++++++++++++++----------------- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-disk.c | 159 +++--- drivers/ide/ide-dma.c | 63 +-- drivers/ide/ide-floppy.c | 362 +++++-------- drivers/ide/ide-generic.c | 119 ++++- drivers/ide/ide-io.c | 47 +- drivers/ide/ide-iops.c | 110 +++-- drivers/ide/ide-lib.c | 42 +- drivers/ide/ide-pnp.c | 42 ++- drivers/ide/ide-probe.c | 304 +++++++++-- drivers/ide/ide-proc.c | 158 +++--- drivers/ide/ide-tape.c | 561 +++++++++---------- drivers/ide/ide-taskfile.c | 29 +- drivers/ide/ide.c | 509 +++-------------- drivers/ide/legacy/Makefile | 1 + drivers/ide/legacy/ali14xx.c | 28 +- drivers/ide/legacy/buddha.c | 4 +- drivers/ide/legacy/dtc2278.c | 22 +- drivers/ide/legacy/falconide.c | 8 +- drivers/ide/legacy/gayle.c | 4 +- drivers/ide/legacy/hd.c | 78 ++-- drivers/ide/legacy/ht6560b.c | 43 +- drivers/ide/legacy/ide-4drives.c | 72 +++ drivers/ide/legacy/ide-cs.c | 82 ++- drivers/ide/legacy/ide_platform.c | 8 +- drivers/ide/legacy/macide.c | 4 +- drivers/ide/legacy/q40ide.c | 3 +- drivers/ide/legacy/qd65xx.c | 190 +++---- drivers/ide/legacy/qd65xx.h | 1 - drivers/ide/legacy/umc8672.c | 78 ++-- drivers/ide/mips/au1xxx-ide.c | 31 +- drivers/ide/mips/swarm.c | 13 +- drivers/ide/pci/aec62xx.c | 37 +- drivers/ide/pci/alim15x3.c | 19 +- drivers/ide/pci/amd74xx.c | 17 +- drivers/ide/pci/atiixp.c | 29 +- drivers/ide/pci/cmd640.c | 255 +++++---- drivers/ide/pci/cmd64x.c | 26 +- drivers/ide/pci/cs5520.c | 12 +- drivers/ide/pci/cs5530.c | 18 +- drivers/ide/pci/cs5535.c | 24 +- drivers/ide/pci/cy82c693.c | 93 ++-- drivers/ide/pci/delkin_cb.c | 17 +- drivers/ide/pci/generic.c | 10 +- drivers/ide/pci/hpt34x.c | 15 +- drivers/ide/pci/hpt366.c | 90 +--- drivers/ide/pci/it8213.c | 34 +- drivers/ide/pci/it821x.c | 44 +- drivers/ide/pci/jmicron.c | 29 +- drivers/ide/pci/ns87415.c | 14 +- drivers/ide/pci/opti621.c | 75 ++-- drivers/ide/pci/pdc202xx_new.c | 21 +- drivers/ide/pci/pdc202xx_old.c | 61 +-- drivers/ide/pci/piix.c | 17 +- drivers/ide/pci/rz1000.c | 2 +- drivers/ide/pci/sc1200.c | 14 +- drivers/ide/pci/scc_pata.c | 57 +-- drivers/ide/pci/serverworks.c | 38 +- drivers/ide/pci/sgiioc4.c | 52 +-- drivers/ide/pci/siimage.c | 88 +--- drivers/ide/pci/sis5513.c | 253 +++++----- drivers/ide/pci/sl82c105.c | 18 +- drivers/ide/pci/slc90e66.c | 22 +- drivers/ide/pci/tc86c001.c | 76 +-- drivers/ide/pci/triflex.c | 12 +- drivers/ide/pci/trm290.c | 13 +- drivers/ide/pci/via82cxxx.c | 18 +- drivers/ide/ppc/mpc8xx.c | 132 ++--- drivers/ide/ppc/pmac.c | 235 +++----- drivers/ide/setup-pci.c | 152 ++---- drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 203 +++---- include/asm-alpha/ide.h | 11 - include/asm-arm/ide.h | 8 - include/asm-blackfin/ide.h | 4 - include/asm-ia64/ide.h | 10 - include/asm-m32r/ide.h | 10 - include/asm-mips/mach-generic/ide.h | 10 - include/asm-parisc/ide.h | 2 - include/asm-powerpc/ide.h | 57 ++- include/asm-powerpc/mediabay.h | 6 +- include/asm-sh/ide.h | 3 - include/asm-sparc/ide.h | 2 - include/asm-sparc64/ide.h | 2 - include/asm-x86/ide.h | 10 - include/linux/Kbuild | 1 - include/linux/hdreg.h | 4 +- include/linux/hdsmart.h | 126 ----- include/linux/ide.h | 260 +++++---- 134 files changed, 3271 insertions(+), 4341 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt create mode 100644 drivers/ide/legacy/ide-4drives.c delete mode 100644 include/linux/hdsmart.h ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/. gregkh-driver ## building file list ... done ./ README debugfs-fix-sparse-warnings.patch driver-core-memory-semaphore-to-mutex.patch driver-core-numactl-interleave-all-doesn-t-works-on-memoryless-node.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch firmware-clean-up-samples-for-coding-style-issues.patch firmware-move-firmware_class-from-documentation-to-samples.patch kobject-catch-kobjects-that-are-not-initialized.patch kobject-properly-initialize-ksets.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch put_device-might_sleep.patch series sysfs-crash-debugging.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch video-add-the-go7007-driver.patch warn-when-statically-allocated-kobjects-are-used.patch sent 314722 bytes received 510 bytes 630464.00 bytes/sec total size is 312036 speedup is 0.99 Using base 2.6.25-rc3 kobject-properly-initialize-ksets.patch kobject-catch-kobjects-that-are-not-initialized.patch uio-kconfig-improvements.patch uio-mark-pci_device_id-hilscher_pci_ids-__devinitdata.patch uio-arch-arm-kconfig-make-uio-available-on-arm-architecture.patch uio-remove-needless-pci_device_id-definition-from-uio_cif.c.patch debugfs-fix-sparse-warnings.patch driver-core-memory-semaphore-to-mutex.patch driver-core-register_memory-unregister_memory-clean-ups-and-bugfix.patch driver-core-numactl-interleave-all-doesn-t-works-on-memoryless-node.patch sysfs-small-header-file-cleanup-for-sysfs-n.patch firmware-move-firmware_class-from-documentation-to-samples.patch firmware-clean-up-samples-for-coding-style-issues.patch pnp-add-all-pnp-card-device-id-s-as-individual-aliases.patch power_state-remove-it-from-driver-core.patch net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch put_device-might_sleep.patch warn-when-statically-allocated-kobjects-are-used.patch sysfs-crash-debugging.patch video-add-the-go7007-driver.patch ## # merge gregkh-driver ## Auto-merged arch/arm/Kconfig Merge made by recursive. arch/arm/Kconfig | 2 + arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + drivers/base/core.c | 1 + drivers/base/memory.c | 29 +- drivers/base/node.c | 7 +- drivers/base/power/main.c | 5 - drivers/media/video/Kconfig | 1 + drivers/media/video/Makefile | 2 + drivers/media/video/go7007/Kconfig | 14 + drivers/media/video/go7007/Makefile | 17 + drivers/media/video/go7007/go7007-driver.c | 693 +++++++++ drivers/media/video/go7007/go7007-fw.c | 1643 ++++++++++++++++++++ drivers/media/video/go7007/go7007-i2c.c | 309 ++++ drivers/media/video/go7007/go7007-priv.h | 279 ++++ drivers/media/video/go7007/go7007-usb.c | 1229 +++++++++++++++ drivers/media/video/go7007/go7007-v4l2.c | 1516 ++++++++++++++++++ drivers/media/video/go7007/go7007.h | 120 ++ drivers/media/video/go7007/saa7134-go7007.c | 484 ++++++ drivers/media/video/go7007/snd-go7007.c | 315 ++++ drivers/media/video/go7007/wis-i2c.h | 55 + drivers/media/video/go7007/wis-ov7640.c | 146 ++ drivers/media/video/go7007/wis-saa7113.c | 378 +++++ drivers/media/video/go7007/wis-saa7115.c | 507 ++++++ drivers/media/video/go7007/wis-sony-tuner.c | 757 +++++++++ drivers/media/video/go7007/wis-tw2804.c | 383 +++++ drivers/media/video/go7007/wis-tw9903.c | 378 +++++ drivers/media/video/go7007/wis-uda1342.c | 136 ++ drivers/net/phy/phy_device.c | 8 +- drivers/uio/Kconfig | 10 +- drivers/uio/uio_cif.c | 6 +- fs/debugfs/inode.c | 4 - fs/sysfs/file.c | 13 + fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 1 + include/linux/debugfs.h | 5 + include/linux/init.h | 1 + include/linux/memory.h | 5 +- include/linux/sysfs.h | 14 +- init/main.c | 9 + lib/kobject.c | 72 +- mm/memory_hotplug.c | 2 +- .../firmware_class/firmware_sample_driver.c | 49 +- .../firmware_sample_firmware_class.c | 39 +- scripts/mod/file2alias.c | 57 +- 45 files changed, 9580 insertions(+), 125 deletions(-) create mode 100644 drivers/media/video/go7007/Kconfig create mode 100644 drivers/media/video/go7007/Makefile create mode 100644 drivers/media/video/go7007/go7007-driver.c create mode 100644 drivers/media/video/go7007/go7007-fw.c create mode 100644 drivers/media/video/go7007/go7007-i2c.c create mode 100644 drivers/media/video/go7007/go7007-priv.h create mode 100644 drivers/media/video/go7007/go7007-usb.c create mode 100644 drivers/media/video/go7007/go7007-v4l2.c create mode 100644 drivers/media/video/go7007/go7007.h create mode 100644 drivers/media/video/go7007/saa7134-go7007.c create mode 100644 drivers/media/video/go7007/snd-go7007.c create mode 100644 drivers/media/video/go7007/wis-i2c.h create mode 100644 drivers/media/video/go7007/wis-ov7640.c create mode 100644 drivers/media/video/go7007/wis-saa7113.c create mode 100644 drivers/media/video/go7007/wis-saa7115.c create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c create mode 100644 drivers/media/video/go7007/wis-tw2804.c create mode 100644 drivers/media/video/go7007/wis-tw9903.c create mode 100644 drivers/media/video/go7007/wis-uda1342.c rename {Documentation => samples}/firmware_class/firmware_sample_driver.c (74%) rename {Documentation => samples}/firmware_class/firmware_sample_firmware_class.c (90%) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-pci/. gregkh-pci base gregkh-driver ## building file list ... done ./ README ide-remove-ide-reverse-ide-core.patch pci-add-is_added-flag-to-struct-pci_dev.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-if-0-pci_assign_resource_fixed.patch pci-if-0-pci_cleanup_aer_correct_error_status.patch pci-include-pci-domain-in-pci-bus-names-on-x86-x86_64.patch pci-make-no_pci_devices-use-the-pci_bus_type-list.patch pci-pcie-aer-don-t-check-_osc-when-acpi-is-disabled.patch pci-remove-global-list-of-pci-devices.patch pci-remove-initial-bios-sort-of-pci-devices-on-x86.patch pci-remove-parisc-consumer-of-the-pci-global_list.patch pci-remove-pci-routeirq-noise-from-dmesg.patch pci-remove-pci_find_present.patch pci-remove-pci_get_device_reverse-from-calgary-driver.patch pci-remove-pci_get_device_reverse.patch pci-remove-pcibios_fixup_ghosts.patch series sent 63829 bytes received 466 bytes 128590.00 bytes/sec total size is 61517 speedup is 0.96 Using base gregkh-driver 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 ## # merge gregkh-pci ## Auto-merged Documentation/ide.txt Auto-merged drivers/ide/Kconfig Auto-merged drivers/ide/ide.c Auto-merged include/linux/ide.h Merge made by recursive. Documentation/ide.txt | 2 - Documentation/kernel-parameters.txt | 6 +- arch/frv/mb93090-mb00/pci-frv.h | 2 - arch/frv/mb93090-mb00/pci-vdk.c | 53 ----- arch/mn10300/unit-asb2305/pci-asb2305.h | 2 - arch/powerpc/platforms/pseries/pci_dlpar.c | 7 +- arch/sh/drivers/pci/pci-sh4.h | 2 - arch/x86/kernel/pci-calgary_64.c | 3 +- arch/x86/pci/acpi.c | 11 +- arch/x86/pci/common.c | 61 ------ arch/x86/pci/pcbios.c | 72 ------- arch/x86/pci/pci.h | 3 - drivers/ide/Kconfig | 9 +- drivers/ide/ide-scan-pci.c | 9 +- drivers/ide/ide.c | 12 - drivers/parisc/dino.c | 1 - drivers/pci/bus.c | 15 +- drivers/pci/hotplug/Kconfig | 4 +- drivers/pci/hotplug/cpcihp_generic.c | 8 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 3 + drivers/pci/pcie/aer/aerdrv_core.c | 3 +- drivers/pci/probe.c | 60 ++---- drivers/pci/remove.c | 10 +- drivers/pci/search.c | 313 +++++++++++----------------- drivers/pci/setup-res.c | 2 +- include/asm-sh/mpc1211/pci.h | 2 - include/linux/aer.h | 5 - include/linux/ide.h | 1 - include/linux/pci.h | 21 +-- 29 files changed, 175 insertions(+), 527 deletions(-) ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb/. gregkh-usb base gregkh-pci ## building file list ... done ./ README series usb-add-sensoray-2255-v4l-driver.patch usb-add-usb-serial-spcp8x5-driver.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-defines-for-usb-link-power-management-ecn.patch usb-ehci-minor-cleanups.patch usb-ehci-minor-soc-bus-glue-fixes.patch usb-ehci-refactor-if-state-hc_state_halt.patch usb-ehci-tolerates-some-buggy-devices.patch usb-ftdi_sio-note-missing-locking.patch usb-gadget-hangup-tty-on-g_serial-disconnect.patch usb-gotemp.patch usb-io_ti-lock-mcr-and-msr-shadows-properly.patch usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.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_storage_onetouch-available-with-pm.patch usb-microtek-remove-unused-semaphore.patch usb-minor-ehci-xitd-simplifications.patch usb-misc-auerswald-ccp_mutex-to-mutex.diff usb-misc-auerswald-ccp_readmutex-to-mutex.diff usb-misc-auerswald-cp_mutex-to-mutex.diff usb-ohci-port-reset-paranoia-timeout.patch usb-serial-note-mos7480-and-option-don-t-lock-modem-status.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-usbatm-convert-heavy-init-dances-to-kthread-api.patch sent 3411047 bytes received 818 bytes 1364746.00 bytes/sec total size is 3406506 speedup is 1.00 Using base gregkh-pci 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-add-usb-serial-spcp8x5-driver.patch usb-gotemp.patch usb-add-sensoray-2255-v4l-driver.patch ## # merge gregkh-usb ## Merge made by recursive. drivers/usb/atm/usbatm.c | 27 +- drivers/usb/atm/usbatm.h | 2 +- drivers/usb/core/config.c | 17 + drivers/usb/core/hcd.h | 2 +- drivers/usb/core/hub.h | 8 +- drivers/usb/gadget/m66592-udc.h | 2 +- drivers/usb/gadget/serial.c | 3 +- drivers/usb/host/ehci-au1xxx.c | 5 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/ehci-fsl.c | 9 +- drivers/usb/host/ehci-hcd.c | 56 +- drivers/usb/host/ehci-hub.c | 2 +- drivers/usb/host/ehci-ixp4xx.c | 3 +- drivers/usb/host/ehci-ppc-soc.c | 5 +- drivers/usb/host/ehci-q.c | 16 +- drivers/usb/host/ehci-sched.c | 44 +- drivers/usb/host/ohci-hub.c | 24 +- drivers/usb/host/ohci-sm501.c | 5 +- drivers/usb/image/Kconfig | 9 + drivers/usb/image/Makefile | 1 + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++++++++ drivers/usb/image/microtek.c | 1 - drivers/usb/image/microtek.h | 1 - drivers/usb/image/s2255drv.c | 2804 +++ drivers/usb/misc/Kconfig | 9 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/auerswald.c | 115 +- drivers/usb/misc/gotemp.c | 295 + drivers/usb/serial/Kconfig | 10 + drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/cypress_m8.c | 284 +- drivers/usb/serial/ftdi_sio.c | 4 +- drivers/usb/serial/io_ti.c | 17 +- drivers/usb/serial/iuu_phoenix.c | 18 +- drivers/usb/serial/kobil_sct.c | 15 +- drivers/usb/serial/mos7840.c | 1 + drivers/usb/serial/option.c | 1 + drivers/usb/serial/spcp8x5.c | 1079 + drivers/usb/serial/ti_usb_3410_5052.c | 9 + drivers/usb/serial/usb-serial.c | 11 +- drivers/usb/storage/Kconfig | 2 +- drivers/usb/storage/libusual.c | 14 +- include/linux/usb.h | 177 +- include/linux/usb/ch9.h | 14 +- 44 files changed, 45078 insertions(+), 383 deletions(-) create mode 100644 drivers/usb/image/f2255usb.h create mode 100644 drivers/usb/image/s2255drv.c create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/spcp8x5.c ## # 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 ## Auto-merged sound/pci/hda/hda_codec.c Auto-merged sound/pci/hda/hda_intel.c Auto-merged sound/pci/hda/patch_analog.c Auto-merged sound/pci/hda/patch_conexant.c Auto-merged sound/pci/hda/patch_realtek.c Auto-merged sound/pci/ice1712/revo.c Auto-merged sound/pci/intel8x0.c 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/usb/caiaq/caiaq-control.c | 4 +- 16 files changed, 258 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 ## Merge made by recursive. arch/avr32/kernel/time.c | 45 ++++++--------------------------- arch/avr32/mach-at32ap/at32ap700x.c | 7 ++++- drivers/char/keyboard.c | 3 +- include/asm-avr32/arch-at32ap/board.h | 5 +++- include/asm-avr32/page.h | 8 ++--- include/asm-avr32/processor.h | 2 +- 6 files changed, 24 insertions(+), 46 deletions(-) ## # git /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master cifs ## Merge made by recursive. fs/cifs/CHANGES | 4 +- fs/cifs/README | 2 +- fs/cifs/cifs_debug.c | 17 ++- fs/cifs/cifs_debug.h | 9 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifs_spnego.c | 2 +- fs/cifs/cifs_unicode.c | 4 +- fs/cifs/cifs_unicode.h | 9 +- fs/cifs/cifsacl.c | 57 ++----- fs/cifs/cifsfs.c | 15 +-- fs/cifs/cifsglob.h | 2 +- fs/cifs/cifsproto.h | 22 ++- fs/cifs/cifssmb.c | 218 ++++++++------------------- fs/cifs/connect.c | 50 +++++- fs/cifs/dir.c | 20 +-- fs/cifs/dns_resolve.h | 2 +- fs/cifs/fcntl.c | 6 +- fs/cifs/file.c | 33 ++--- fs/cifs/inode.c | 399 ++++++++++++++++++------------------------------ fs/cifs/ioctl.c | 2 +- fs/cifs/md4.c | 4 +- fs/cifs/md5.c | 9 +- fs/cifs/misc.c | 14 +- fs/cifs/netmisc.c | 23 ++-- fs/cifs/readdir.c | 54 +++---- fs/cifs/sess.c | 4 - fs/cifs/smbdes.c | 22 ++-- fs/cifs/transport.c | 11 +- fs/cifs/xattr.c | 9 +- 29 files changed, 410 insertions(+), 615 deletions(-) ## # git /pub/scm/linux/kernel/git/davej/cpufreq.git master cpufreq ## Auto-merged drivers/cpufreq/cpufreq.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/e_powersaver.c | 2 + drivers/cpufreq/cpufreq.c | 109 +++++++++++++--------------- 2 files changed, 54 insertions(+), 57 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/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/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 + 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/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 +++++++++++++++++-------------- 42 files changed, 285 insertions(+), 219 deletions(-) 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 ## Auto-merged drivers/media/video/Kconfig Auto-merged drivers/media/video/Makefile Auto-merged include/asm-arm/arch-pxa/pxa-regs.h Merge made by recursive. Documentation/video4linux/CARDLIST.cx88 | 6 + 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/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/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 2 +- 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/tda10086.c | 2 +- drivers/media/dvb/frontends/tda18271-common.c | 19 +- drivers/media/dvb/frontends/tda18271-fe.c | 230 ++---- drivers/media/dvb/frontends/tda18271-priv.h | 7 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/dvb/frontends/tda827x.c | 8 +- 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-typhoon.c | 2 +- drivers/media/video/Kconfig | 47 +- 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-driver.c | 43 +- drivers/media/video/bt8xx/bttv-vbi.c | 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-dvb.c | 2 +- drivers/media/video/cx23885/cx23885-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx25840/cx25840-firmware.c | 11 +- drivers/media/video/cx88/cx88-alsa.c | 8 +- drivers/media/video/cx88/cx88-blackbird.c | 6 +- drivers/media/video/cx88/cx88-cards.c | 426 ++++++++- drivers/media/video/cx88/cx88-core.c | 6 +- drivers/media/video/cx88/cx88-dvb.c | 158 ++++- drivers/media/video/cx88/cx88-i2c.c | 4 +- drivers/media/video/cx88/cx88-input.c | 2 +- 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 | 18 +- drivers/media/video/cx88/cx88.h | 6 + drivers/media/video/dabfirmware.h | 7 + drivers/media/video/dabusb.c | 8 +- drivers/media/video/dpc7146.c | 4 +- drivers/media/video/em28xx/em28xx-core.c | 6 +- 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 | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 11 +- drivers/media/video/ivtv/ivtv-driver.h | 2 + drivers/media/video/ivtv/ivtv-firmware.c | 8 +- drivers/media/video/ivtv/ivtv-ioctl.c | 36 +- drivers/media/video/ivtv/ivtv-irq.c | 25 +- drivers/media/video/ivtv/ivtv-yuv.c | 38 +- drivers/media/video/meye.c | 12 +- drivers/media/video/mt20xx.c | 9 +- drivers/media/video/mt9m001.c | 703 +++++++++++++++ drivers/media/video/mt9v022.c | 819 +++++++++++++++++ drivers/media/video/mxb.c | 4 +- drivers/media/video/pms.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- drivers/media/video/pwc/pwc-if.c | 8 +- drivers/media/video/pxa_camera.c | 915 +++++++++++++++++++ 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 | 2 +- drivers/media/video/saa711x.c | 2 +- drivers/media/video/saa7134/saa7134-alsa.c | 12 +- drivers/media/video/saa7134/saa7134-cards.c | 364 +++++++- drivers/media/video/saa7134/saa7134-core.c | 48 +- drivers/media/video/saa7134/saa7134-dvb.c | 122 +++- 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-ts.c | 2 +- drivers/media/video/saa7134/saa7134-tvaudio.c | 6 +- drivers/media/video/saa7134/saa7134-vbi.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 10 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7185.c | 2 +- drivers/media/video/se401.c | 2 +- drivers/media/video/sn9c102/sn9c102_core.c | 4 +- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/soc_camera.c | 999 +++++++++++++++++++++ drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 9 +- drivers/media/video/tda8290.c | 3 +- drivers/media/video/tda9840.c | 2 +- drivers/media/video/tda9887.c | 3 +- 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 | 44 +- drivers/media/video/tuner-i2c.h | 118 +++- drivers/media/video/tuner-simple.c | 513 +++++++---- drivers/media/video/tuner-simple.h | 11 +- drivers/media/video/tuner-types.c | 6 + drivers/media/video/tuner-xc2028.c | 18 +- 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 | 2 +- drivers/media/video/usbvision/usbvision-core.c | 14 +- drivers/media/video/usbvision/usbvision-i2c.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 4 +- drivers/media/video/v4l1-compat.c | 4 +- drivers/media/video/videobuf-dma-sg.c | 119 ++-- 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/meye.h | 2 +- include/linux/videodev2.h | 52 +- include/media/soc_camera.h | 149 +++ include/media/v4l2-chip-ident.h | 6 + include/media/videobuf-dma-sg.h | 14 +- 169 files changed, 6220 insertions(+), 1106 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-rc3-git1 to 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 Using base 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 i2c-amd756-fix-off-by-one.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.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-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 | 125 ++++---- drivers/i2c/algos/i2c-algo-pca.h | 26 -- drivers/i2c/busses/Kconfig | 11 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-amd756.c | 2 +- drivers/i2c/busses/i2c-ibm_iic.c | 197 +++++++++++++- drivers/i2c/busses/i2c-pca-isa.c | 53 ++--- drivers/i2c/busses/i2c-sh7760.c | 577 ++++++++++++++++++++++++++++++++++++++ drivers/i2c/chips/isp1301_omap.c | 59 ++-- drivers/i2c/i2c-dev.c | 327 +++++++++++----------- include/asm-sh/i2c-sh7760.h | 22 ++ include/linux/i2c-algo-pca.h | 37 ++- 13 files changed, 1118 insertions(+), 358 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.h create mode 100644 drivers/i2c/busses/i2c-sh7760.c create mode 100644 include/asm-sh/i2c-sh7760.h ## # git /pub/scm/linux/kernel/git/jikos/hid.git upstream hid-upstream ## Merge made by recursive. drivers/hid/usbhid/hid-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ## # git /pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git master hrt ## Merge made by recursive. kernel/time/ntp.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## 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/setup_64.c Removed arch/x86/kvm/segment_descriptor.h Merge made by recursive. arch/x86/Kconfig | 10 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/kvmclock.c | 161 ++++++++++++++ arch/x86/kernel/setup_32.c | 5 + arch/x86/kernel/setup_64.c | 5 + arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/lapic.c | 4 + arch/x86/kvm/mmu.c | 419 +++++++++++++++++++++++++++++++------ arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 74 ++++--- arch/x86/kvm/segment_descriptor.h | 29 --- arch/x86/kvm/svm.c | 235 +++++++++++++++++---- arch/x86/kvm/vmx.c | 140 +++++++++--- arch/x86/kvm/vmx.h | 10 +- arch/x86/kvm/x86.c | 378 +++++++++++++++++++++++---------- arch/x86/kvm/x86_emulate.c | 256 +++++++++++++---------- include/asm-x86/kvm_host.h | 39 +++- include/asm-x86/kvm_para.h | 25 +++ include/linux/kvm.h | 7 +- include/linux/kvm_host.h | 15 ++- virt/kvm/ioapic.c | 8 + virt/kvm/kvm_main.c | 96 +++++++-- 22 files changed, 1467 insertions(+), 458 deletions(-) create mode 100644 arch/x86/kernel/kvmclock.c 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 ## Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 2 + block/blk-core.c | 2 + block/blk-settings.c | 1 - drivers/block/cciss.c | 257 ++++++++++++++++++++------------- drivers/block/cciss_scsi.c | 10 +- fs/splice.c | 12 +- 6 files changed, 174 insertions(+), 110 deletions(-) ## # 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-linus infiniband-for-linus ## Merge made by recursive. MAINTAINERS | 2 +- drivers/infiniband/core/cm.c | 3 +- drivers/infiniband/core/fmr_pool.c | 38 +++++++++++++++----------- drivers/infiniband/hw/cxgb3/iwch_provider.c | 3 ++ 4 files changed, 28 insertions(+), 18 deletions(-) ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## Auto-merged drivers/infiniband/core/cm.c Merge made by recursive. drivers/infiniband/core/addr.c | 8 +- drivers/infiniband/core/cm.c | 65 +++++--- drivers/infiniband/core/cma.c | 20 ++-- drivers/infiniband/hw/amso1100/c2.c | 80 +++++----- drivers/infiniband/hw/amso1100/c2.h | 10 +- drivers/infiniband/hw/amso1100/c2_mm.c | 2 +- drivers/infiniband/hw/amso1100/c2_mq.c | 4 +- drivers/infiniband/hw/amso1100/c2_mq.h | 2 +- drivers/infiniband/hw/amso1100/c2_rnic.c | 24 ++-- drivers/infiniband/hw/amso1100/c2_wr.h | 214 ++++++++++++------------ drivers/infiniband/hw/cxgb3/iwch.h | 2 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 3 +- drivers/infiniband/hw/ipath/ipath_init_chip.c | 8 +- drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 4 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 10 +- drivers/infiniband/hw/mthca/mthca_eq.c | 4 +- drivers/infiniband/hw/mthca/mthca_mad.c | 2 +- drivers/infiniband/hw/mthca/mthca_memfree.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- drivers/infiniband/hw/nes/nes.c | 7 - drivers/infiniband/hw/nes/nes.h | 9 - drivers/infiniband/hw/nes/nes_cm.c | 4 +- drivers/net/mlx4/cmd.c | 3 +- include/rdma/ib_verbs.h | 2 +- 26 files changed, 256 insertions(+), 239 deletions(-) ## # 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 ## Merge made by recursive. arch/arm/mm/pgd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ## # 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 | 38 ---------- drivers/firewire/fw-device.h | 27 ++++--- drivers/firewire/fw-ohci.c | 114 +++++++++++++++++++++------- drivers/firewire/fw-sbp2.c | 120 ++++++++++++------------------ drivers/firewire/fw-transaction.c | 2 +- drivers/firewire/fw-transaction.h | 10 +-- drivers/ieee1394/csr.c | 6 +- drivers/ieee1394/dv1394.c | 3 +- drivers/ieee1394/nodemgr.c | 6 +- drivers/ieee1394/ohci1394.c | 109 ++++++++++++--------------- drivers/ieee1394/raw1394.c | 1 - drivers/ieee1394/sbp2.c | 7 +- drivers/ieee1394/video1394.c | 3 +- lib/Kconfig.debug | 10 +++ 15 files changed, 233 insertions(+), 236 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 7 + crypto/async_tx/async_memcpy.c | 6 +- crypto/async_tx/async_memset.c | 6 +- crypto/async_tx/async_tx.c | 203 +++++-- crypto/async_tx/async_xor.c | 12 +- drivers/dma/Kconfig | 19 +- drivers/dma/Makefile | 1 + drivers/dma/dmaengine.c | 3 - drivers/dma/fsldma.c | 1060 ++++++++++++++++++++++++++++++++ drivers/dma/fsldma.h | 189 ++++++ 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 +- net/core/user_dma.c | 2 +- 17 files changed, 1461 insertions(+), 106 deletions(-) create mode 100644 drivers/dma/fsldma.c create mode 100644 drivers/dma/fsldma.h ## # 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(-) ## # git /pub/scm/linux/kernel/git/davem/net-2.6.git master net ## Already up-to-date. ## # git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git linux-next nfs ## Merge made by recursive. fs/nfs/client.c | 2 + fs/nfs/direct.c | 9 +- fs/nfs/inode.c | 43 +++++++- fs/nfs/internal.h | 1 + fs/nfs/nfs4proc.c | 10 ++- fs/nfs/nfs4state.c | 8 +- fs/nfs/read.c | 16 +-- fs/nfs/write.c | 65 +++++----- include/linux/sunrpc/clnt.h | 9 +- include/linux/sunrpc/sched.h | 41 +++---- net/sunrpc/auth_gss/auth_gss.c | 5 +- net/sunrpc/clnt.c | 8 +- net/sunrpc/rpcb_clnt.c | 2 +- net/sunrpc/sched.c | 255 ++++++++++++++++++---------------------- net/sunrpc/xprt.c | 45 ++++--- net/sunrpc/xprtsock.c | 7 +- 16 files changed, 282 insertions(+), 244 deletions(-) ## # git git://git.linux-nfs.org/~bfields/linux.git for-linus nfsd-for-linus ## Already up-to-date. ## # git git://git.linux-nfs.org/~bfields/linux.git for-2.6.26 nfsd ## Auto-merged fs/nfsd/export.c Auto-merged fs/nfsd/nfsctl.c Auto-merged include/net/ipv6.h Auto-merged net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svcauth_unix.c Merge made by recursive. fs/nfs/symlink.c | 1 - fs/nfsd/export.c | 9 ++- fs/nfsd/nfsctl.c | 15 +++++- include/linux/nfs3.h | 2 +- include/linux/sunrpc/svcauth.h | 4 +- include/net/ipv6.h | 9 +++ net/sunrpc/auth_gss/auth_gss.c | 39 ++++++++----- net/sunrpc/svcauth_unix.c | 118 +++++++++++++++++++++++++++------------- 8 files changed, 135 insertions(+), 62 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390-linus ## Merge made by recursive. arch/s390/kernel/Makefile | 5 +++++ arch/s390/kernel/process.c | 4 ++++ arch/s390/kernel/smp.c | 10 ++-------- arch/s390/kernel/time.c | 2 -- drivers/s390/block/dasd_3990_erp.c | 6 ++---- drivers/s390/block/dasd_proc.c | 4 +++- 6 files changed, 16 insertions(+), 15 deletions(-) ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features s390 ## Merge made by recursive. drivers/s390/block/dasd_3990_erp.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/s390/block/dasd_int.h | 5 +++++ 2 files changed, 41 insertions(+), 0 deletions(-) ## # 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 Merge made by recursive. Documentation/ABI/obsolete/o2cb | 11 + Documentation/ABI/stable/o2cb | 10 + Documentation/feature-removal-schedule.txt | 10 + fs/ocfs2/alloc.c | 460 +++++++++++++++++++++++++--- fs/ocfs2/aops.c | 2 +- fs/ocfs2/cluster/sys.c | 9 + fs/ocfs2/cluster/tcp.c | 55 +++- fs/ocfs2/cluster/tcp_internal.h | 2 + fs/ocfs2/dir.c | 5 +- fs/ocfs2/dlm/dlmcommon.h | 20 +- fs/ocfs2/dlm/dlmdomain.c | 195 +++++++----- fs/ocfs2/dlm/dlmmaster.c | 6 +- fs/ocfs2/dlmglue.c | 10 +- fs/ocfs2/dlmglue.h | 2 - fs/ocfs2/file.c | 4 +- fs/ocfs2/heartbeat.c | 26 +- fs/ocfs2/heartbeat.h | 5 - fs/ocfs2/ioctl.c | 12 +- fs/ocfs2/ioctl.h | 3 +- fs/ocfs2/localalloc.c | 6 +- fs/ocfs2/namei.c | 2 +- fs/sysfs/symlink.c | 9 +- 22 files changed, 654 insertions(+), 210 deletions(-) create mode 100644 Documentation/ABI/obsolete/o2cb create mode 100644 Documentation/ABI/stable/o2cb ## # 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 next selinux ## Merge made by recursive. security/selinux/hooks.c | 42 ++++++++++--- 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/selinuxfs.c | 3 +- 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 | 31 +++++----- 13 files changed, 139 insertions(+), 179 deletions(-) ## # git /pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git master sched ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lethal/sh-2.6.git master sh ## Already up-to-date. ## # 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 ## Merge made by recursive. Documentation/DocBook/Makefile | 11 ++- fs/9p/fid.h | 15 +++ fs/9p/v9fs.c | 12 +- 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/conv.c | 128 +++++++++++++++++++++- net/9p/error.c | 11 ++- net/9p/fcprint.c | 8 ++ net/9p/mod.c | 7 +- net/9p/trans_fd.c | 146 +++++++++++++++++++++---- net/9p/trans_virtio.c | 155 ++++++++++++++++++++++++-- net/9p/util.c | 32 +++++- 21 files changed, 887 insertions(+), 140 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 ## Already up-to-date. ## # 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 ------------ 3 files changed, 69 insertions(+), 87 deletions(-) delete mode 100644 arch/xtensa/boot/ramdisk/Makefile ## # git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## Merge made by recursive. arch/x86/kernel/head_64.S | 4 ++-- include/asm-x86/page_64.h | 4 ++-- include/asm-x86/pgtable_64.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ## # 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 ## Using base 2.6.25-rc3 docbook-audit-prms.patch docsrc-spi-split-fix.patch kerndoc-env-set-verbose.patch ## # merge doc ## Auto-merged kernel/audit.c Merge made by recursive. Documentation/spi/spidev | 168 +--------------------------------------- Documentation/spi/spidev_fdx.c | 158 +++++++++++++++++++++++++++++++++++++ kernel/audit.c | 4 +- scripts/kernel-doc | 4 + 4 files changed, 166 insertions(+), 168 deletions(-) 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/asb100.c | 4 ---- 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 ++-- 19 files changed, 105 insertions(+), 26 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 | 13 +- drivers/mtd/ubi/vmt.c | 4 +- include/mtd/Kbuild | 1 - 8 files changed, 239 insertions(+), 23 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 ## Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 9 ++++++ arch/parisc/Makefile | 3 ++ .../{defconfig => configs/default_defconfig} | 0 arch/parisc/kernel/firmware.c | 27 +++++++++++------ arch/parisc/kernel/hardware.c | 13 ++++++++- arch/parisc/kernel/pdc_cons.c | 30 ++++++++++--------- arch/parisc/kernel/syscall_table.S | 5 ++- arch/parisc/kernel/traps.c | 25 ++++++++++++++-- drivers/parisc/pdc_stable.c | 6 ++-- include/asm-parisc/elf.h | 22 ++++++-------- include/asm-parisc/fixmap.h | 9 +++++- include/asm-parisc/futex.h | 10 +++++- include/asm-parisc/pdc.h | 3 +- include/asm-parisc/pgalloc.h | 4 +- include/asm-parisc/pgtable.h | 8 ----- include/asm-parisc/unistd.h | 5 ++- 16 files changed, 119 insertions(+), 60 deletions(-) rename arch/parisc/{defconfig => configs/default_defconfig} (100%) ## # 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 git://git.kernel.org/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 | 20 ++++----- fs/ext4/file.c | 2 +- fs/ext4/fsync.c | 3 + fs/ext4/ialloc.c | 108 ++++++++++++++++++++++++++++++++++++++++--- fs/ext4/inode.c | 20 +------- fs/ext4/ioctl.c | 12 +---- fs/ext4/mballoc.c | 63 +++++++++++-------------- fs/ext4/namei.c | 9 +++- fs/ext4/resize.c | 6 +-- fs/ext4/super.c | 61 ++++++++++++++++++++++++- fs/ext4/xattr.c | 12 ++--- fs/jbd2/journal.c | 13 +++--- fs/jbd2/revoke.c | 4 +- include/linux/ext4_fs.h | 28 ++++++++++- include/linux/ext4_fs_sb.h | 3 + 17 files changed, 278 insertions(+), 117 deletions(-) ## # check ## Differences exist, continuing ## # label ## Created commit dad09fc: 2.6.25-rc3-mc10 1 files changed, 1 insertions(+), 1 deletions(-) ## # diff /pub/linux/kernel/people/jejb/merge-tree/patch- ## ## # log /pub/linux/kernel/people/jejb/merge-tree/log- ##