Switched to branch "2.6.25-rc2-mc2" 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-rc2-mc2" Already on branch "2.6.25-rc2-mc2" Switched to branch "gregkh-pci" Switched to branch "2.6.25-rc2-mc2" Already on branch "2.6.25-rc2-mc2" Switched to branch "gregkh-usb" Switched to branch "2.6.25-rc2-mc2" Already on branch "2.6.25-rc2-mc2" From /pub/scm/linux/kernel/git/airlied/agp-2.6 * [new branch] agp-patches -> agp Switched to branch "i2c" Switched to branch "2.6.25-rc2-mc2" Already on branch "2.6.25-rc2-mc2" Switched to branch "ide" Switched to branch "2.6.25-rc2-mc2" Already on branch "2.6.25-rc2-mc2" From /pub/scm/linux/kernel/git/roland/infiniband * [new branch] for-2.6.26 -> infiniband remote: Counting objects: 1  remote: Counting objects: 78, done. remote: Compressing objects: 2% (1/50)  remote: Compressing objects: 4% (2/50)  remote: Compressing objects: 6% (3/50)  remote: Compressing objects: 8% (4/50)  remote: Compressing objects: 10% (5/50)  remote: Compressing objects: 12% (6/50)  remote: Compressing objects: 14% (7/50)  remote: Compressing objects: 16% (8/50)  remote: Compressing objects: 18% (9/50)  remote: Compressing objects: 20% (10/50)  remote: Compressing objects: 22% (11/50)  remote: Compressing objects: 24% (12/50)  remote: Compressing objects: 26% (13/50)  remote: Compressing objects: 28% (14/50)  remote: Compressing objects: 30% (15/50)  remote: Compressing objects: 32% (16/50)  remote: Compressing objects: 34% (17/50)  remote: Compressing objects: 36% (18/50)  remote: Compressing objects: 38% (19/50)  remote: Compressing objects: 40% (20/50)  remote: Compressing objects: 42% (21/50)  remote: Compressing objects: 44% (22/50)  remote: Compressing objects: 46% (23/50)  remote: Compressing objects: 48% (24/50)  remote: Compressing objects: 50% (25/50)  remote: Compressing objects: 52% (26/50)  remote: Compressing objects: 54% (27/50)  remote: Compressing objects: 56% (28/50)  remote: Compressing objects: 58% (29/50)  remote: Compressing objects: 60% (30/50)  remote: Compressing objects: 62% (31/50)  remote: Compressing objects: 64% (32/50)  remote: Compressing objects: 66% (33/50)  remote: Compressing objects: 68% (34/50)  remote: Compressing objects: 70% (35/50)  remote: Compressing objects: 72% (36/50)  remote: Compressing objects: 74% (37/50)  remote: Compressing objects: 76% (38/50)  remote: Compressing objects: 78% (39/50)  remote: Compressing objects: 80% (40/50)  remote: Compressing objects: 82% (41/50)  remote: Compressing objects: 84% (42/50)  remote: Compressing objecremote: ts: 86% (43/50)  remote: Compressing objects: 88% (44/50)  remote: Compressing objects: 90% (45/50)  remote: Compressing objects: 92% (46/50)  remote: Compressing objects: 94% (47/50)  remote: Compressing objects: 96% (48/50)  remote: Compressing objects: 98% (49/50)  remote: Compressing objects: 100% (50/50)  remote: Compressing objects: 100% (50/50), done. remote: Total 68 (delta 55), reused 31 (delta 18) From /pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 + 77dd989...e80de37 master -> ieee1394 (forced update) remote: Generating pack... remote: Done counting 90 objects. remote: Result has 64 objects. remote: Deltifying 64 objects. remote: 1% (1/64) done remote: 3% (2/64) done remote: 4% (3/64) done remote: 6% (4/64) done remote: 7% (5/64) done remote: 9% (6/64) done remote: 10% (7/64) done remote: 12% (8/64) done remote: 14% (9/64) done remote: 15% (10/64) done remote: 17% (11/64) done remote: 18% (12/64) done remote: 20% (13/64) done remote: 21% (14/64) done remote: 23% (15/64) done remote: 25% (16/64) done remote: 26% (17/64) done remote: 28% (18/64) done remote: 29% (19/64) done remote: 31% (20/64) done remote: 32% (21/64) done remote: 34% (22/64) done remote: 35% (23/64) done remote: 37% (24/64) done remote: 39% (25/64) done remote: 40% (26/64) done remote: 42% (27/64) done remote: 43% (28/64) done remote: 45% (29/64) done remote: 46% (30/64) done remote: 48% (31/64) done remote: 50% (32/64) done remote: 51% (33/64) done remote: 53% (34/64) done remote: 54% (35/64) done remote: 56% (36/64) done remote: 57% (37/64) done remote: 59% (38/64) done remote: 60% (39/64) done remote: 62% (40/64) done remote: 64% (41/64) done remote: 65% (42/64) done remote: 67% (43/64) done remote: 68% (44/64) done remote: 70% (45/64) done remote: 71% (46/64) done remote: 73% (47/64) done remote: 75% (48/64) done remote: 76% (49/64) done remote: 78% (50/64) done remote: 79% (51/64) done remote: 81% (52/64) done remote: 82% (53/64) done remote: 84% (54/64) done remote: 85% (55/64) done remote: 87% (56/64) done remote: 89% (57/64) done remote: 90% (58/64) done remote: 92% (59/64) done remote: 93% (60/64) done remote: 95% (61/64) done remote: 96% (62/64) done remote: 98% (63/64) done remote: 100% (64/64) done remote: remote: Total 64 (delta 54), reused 51 (delta 41) From git://git390.osdl.marist.edu/pub/scm/linux-2.6 + 71ff93b...1d23b96 for-linus -> s390 (forced update) error: branch 'ocfs2' not found. error: branch 'selinux' not found. Already on branch "2.6.25-rc2-mc2" remote: Counting objects: 1  remote: Counting objects: 42, done. remote: Compressing objects: 5% (1/17)  remote: Compressing objects: 11% (2/17)  remote: Compressing objects: 17% (3remote: /17)  remote: Compressing objects: 23% (4/17)  remote: Compressing objects: 29% (5/17)  remote: Compressing objects: 35% (6/17)  remote: Compressing remote: objects: 41% (7/17)  remote: Compressing objects: 47% (8/17)  remote: Compressing objects: 52% (9/17)  remote: Compressing objects: 58% (10/17remote: )  remote: Compressing objects: 64% (11/17)  remote: Compressing objects: 70% (12/17)  remote: Compressing objects: 76% (13/17)  remote: Compressing remote: objects: 82% (14/17)  remote: Compressing objects: 88% (15/17)  remote: Compressing objects: 94% (16/17)  remote: Compressing objects: 100% (17remote: /17)  remote: Compressing objects: 100% (17/17), done. remote: Total 30 (delta 26), reused 17 (delta 13) From /pub/scm/linux/kernel/git/x86/linux-2.6-x86 + 8296e36...e138b42 master -> x86 (forced update) Switched to branch "doc" Switched to branch "2.6.25-rc2-mc2" Already on branch "2.6.25-rc2-mc2" 5-v4l-driver.patch usb-add-usb-serial-spcp8x5-driver.patch usb-ftdi_sio.c-add-missing.patch usb-gotemp.patch usb-sane-memory-allocation-in-option-driver.patch sent 3337215 bytes received 180 bytes 2224930.00 bytes/sec total size is 3336051 speedup is 1.00 usb-ftdi_sio.c-add-missing.patch usb-sane-memory-allocation-in-option-driver.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/image/Kconfig | 9 + drivers/usb/image/Makefile | 1 + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++++++++++++++++ drivers/usb/image/s2255drv.c | 2727 +++ drivers/usb/image/s2255drv.h | 245 + drivers/usb/misc/Kconfig | 9 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/gotemp.c | 295 + drivers/usb/serial/Kconfig | 10 + drivers/usb/serial/Makefile | 3 +- drivers/usb/serial/ftdi_sio.c | 4 +- drivers/usb/serial/option.c | 33 +- drivers/usb/serial/spcp8x5.c | 1079 ++ 13 files changed, 44744 insertions(+), 6 deletions(-) create mode 100644 drivers/usb/image/f2255usb.h create mode 100644 drivers/usb/image/s2255drv.c create mode 100644 drivers/usb/image/s2255drv.h 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 ## Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 1 + sound/core/oss/mixer_oss.c | 2 + sound/pci/hda/hda_codec.c | 73 +++++++++++- sound/pci/hda/hda_codec.h | 12 ++- sound/pci/hda/hda_intel.c | 89 ++++++++------- sound/pci/hda/hda_proc.c | 3 +- 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 | 8 +- sound/pci/hda/patch_realtek.c | 138 +++++++++++++++-------- 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/pci/oxygen/oxygen.c | 35 ++++++ sound/pci/oxygen/oxygen_lib.c | 10 +- sound/pci/oxygen/oxygen_pcm.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 2 +- sound/usb/caiaq/caiaq-control.c | 4 +- 22 files changed, 329 insertions(+), 140 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/boards/atstk1000/atstk1004.c | 2 +- arch/avr32/kernel/time.c | 45 +++++------------------------- arch/avr32/mach-at32ap/at32ap700x.c | 7 ++++- arch/avr32/mm/fault.c | 2 + drivers/char/keyboard.c | 3 +- include/asm-avr32/arch-at32ap/board.h | 5 +++- include/asm-avr32/page.h | 8 ++--- include/asm-avr32/pgtable.h | 1 + include/asm-avr32/processor.h | 2 +- 9 files changed, 28 insertions(+), 47 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 | 117 ++++++++++--------------- 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, 306 insertions(+), 437 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(-) ## # skip quilt /pub/linux/kernel/people/agk/patches/2.6/editing/. dm ## SKIPPING: skip quilt /pub/linux/kernel/people/agk/patches/2.6/editing/. dm ## # skip merge dm ## SKIPPING: skip merge dm ## # git /pub/scm/linux/kernel/git/paulus/powerpc.git master powerpc ## Already up-to-date. ## # 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 master dvb ## Auto-merged drivers/media/video/Kconfig Auto-merged drivers/media/video/Makefile Merge made by recursive. Documentation/video4linux/CARDLIST.em28xx | 2 +- Documentation/video4linux/CARDLIST.saa7134 | 6 +- Documentation/video4linux/zr364xx.txt | 4 +- drivers/media/Kconfig | 16 +- drivers/media/common/Kconfig | 2 +- drivers/media/common/ir-keymaps.c | 46 ++ drivers/media/common/saa7146_vbi.c | 1 - drivers/media/common/saa7146_video.c | 2 - drivers/media/dvb/bt8xx/bt878.c | 23 +- drivers/media/dvb/dvb-usb/ttusb2.c | 1 + drivers/media/dvb/frontends/tda10086.c | 28 +- drivers/media/dvb/frontends/tda10086.h | 3 + drivers/media/dvb/frontends/tda18271-common.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 15 +- drivers/media/dvb/ttpci/budget-av.c | 8 + drivers/media/dvb/ttpci/budget.c | 1 + drivers/media/radio/Kconfig | 4 +- drivers/media/radio/radio-sf16fmi.c | 1 + drivers/media/radio/radio-sf16fmr2.c | 5 +- drivers/media/radio/radio-si470x.c | 597 +++++++++++++++---------- drivers/media/video/Kconfig | 4 +- drivers/media/video/Makefile | 5 +- drivers/media/video/bt8xx/bttv-driver.c | 50 +-- drivers/media/video/bt8xx/bttv-vbi.c | 4 +- drivers/media/video/cx88/cx88-mpeg.c | 16 +- drivers/media/video/cx88/cx88.h | 1 + drivers/media/video/em28xx/em28xx-audio.c | 6 +- drivers/media/video/em28xx/em28xx-cards.c | 8 +- drivers/media/video/em28xx/em28xx-core.c | 111 +++-- drivers/media/video/em28xx/em28xx-video.c | 79 +++- drivers/media/video/em28xx/em28xx.h | 5 +- drivers/media/video/saa7134/saa7134-cards.c | 123 +++++- drivers/media/video/saa7134/saa7134-dvb.c | 28 +- drivers/media/video/saa7134/saa7134-empress.c | 6 +- drivers/media/video/saa7134/saa7134-input.c | 6 + drivers/media/video/saa7134/saa7134-video.c | 20 +- drivers/media/video/saa7134/saa7134.h | 2 + drivers/media/video/stk-sensor.c | 23 +- drivers/media/video/stk-webcam.c | 104 ++++- drivers/media/video/stk-webcam.h | 3 +- drivers/media/video/tcm825x.c | 2 +- drivers/media/video/tuner-core.c | 2 +- drivers/media/video/tvaudio.c | 10 +- drivers/media/video/tveeprom.c | 2 +- drivers/media/video/v4l2-common.c | 393 ++--------------- drivers/media/video/videobuf-core.c | 78 ++-- drivers/media/video/videobuf-dma-sg.c | 4 +- drivers/media/video/videobuf-vmalloc.c | 20 +- drivers/media/video/videodev.c | 444 ++++++++++++++++--- drivers/media/video/zr364xx.c | 2 + include/media/ir-common.h | 1 + include/media/v4l2-common.h | 2 - include/media/v4l2-dev.h | 2 + include/media/videobuf-core.h | 2 +- include/media/videobuf-vmalloc.h | 2 +- 55 files changed, 1430 insertions(+), 907 deletions(-) ## # quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ i2c ## i2c-pxa-misc-fixes.patch i2c-no-algos-in-kconfig.patch i2c-pca-01-removing-trailing-whitespace.patch i2c-pca-02-extension-of-pca-algorithm.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/i2c-pca-isa.c | 53 ++++++---------- drivers/i2c/busses/i2c-pxa.c | 27 +++++---- include/linux/i2c-algo-pca.h | 37 ++++++++++-- 6 files changed, 134 insertions(+), 173 deletions(-) delete mode 100644 drivers/i2c/algos/i2c-algo-pca.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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git for-linus input ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/dtor/input.git master input-devel ## 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 ## Auto-merged Makefile Merge made by recursive. Makefile | 11 +++++++---- lib/Kconfig.debug | 3 +++ scripts/kconfig/symbol.c | 34 +++++++++++++++++++++------------- 3 files changed, 31 insertions(+), 17 deletions(-) ## # git /pub/scm/linux/kernel/git/avi/kvm.git master kvm ## Merge made by recursive. arch/x86/kvm/kvm_svm.h | 2 + arch/x86/kvm/mmu.c | 190 ++++++++++++++++++++++++++++-------- arch/x86/kvm/mmu.h | 6 + arch/x86/kvm/paging_tmpl.h | 35 ++++--- arch/x86/kvm/svm.c | 233 +++++++++++++++++++++++++++++++++++--------- arch/x86/kvm/vmx.c | 114 +++++++++++++++++----- arch/x86/kvm/vmx.h | 10 ++- arch/x86/kvm/x86.c | 142 ++++++++++++++++----------- arch/x86/kvm/x86_emulate.c | 143 +++++++++++++++------------ include/asm-x86/kvm_host.h | 9 ++- include/linux/kvm.h | 4 +- include/linux/kvm_host.h | 3 + virt/kvm/kvm_main.c | 18 +++- 13 files changed, 651 insertions(+), 258 deletions(-) ## # 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. ## # quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## building file list ... done ./ ide-acpi-add-missing-drive-acpidata-zeroing.patch ide-add-config_ide_arch_obsolete_defaults.patch ide-add-generic-packet-command-representation-ide_atapi_pc.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-missing-base-addresses-for-falconide-and-macide.patch ide-add-warm-plug-support-for-ide-devices.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-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-set-hwif-chipset.patch ide-libata-st310211a-has-buggy-hpa-too.patch ide-move-ide_port_setup_devices-call-to-ide_device_add_all.patch ide-pmac-remove-dead-code.patch ide-remove-broken-dangerous-ide-unregister-scan-hwif-ioctls-take-2.patch ide-remove-config_blk_dev_hd_ide-config-option.patch ide-remove-config_ide_arch_obsolete_init.patch ide-remove-hold-field-from-ide_hwif_t-take-2.patch ide-remove-ide_-_reg-macros.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-obsoleted-idex-base_-ctl_-irq_-kernel-parameters.patch ide-rework-powermac-media-bay-support-take-2.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-schedule-driver-for-removal-after-6-months.patch ide-use-generic-atapi-packet-command-flags-in-ide-floppy-tape.patch ide-use-ide_find_port-instead-of-ide_deprecated_find_port.patch maintainers-update-ide-cd-maintainer-s-email-address.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 series sent 278052 bytes received 1082 bytes 558268.00 bytes/sec total size is 272241 speedup is 0.98 ide-add-missing-base-addresses-for-falconide-and-macide.patch ide-libata-st310211a-has-buggy-hpa-too.patch maintainers-update-ide-cd-maintainer-s-email-address.patch ide-tape-schedule-driver-for-removal-after-6-months.patch 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-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-2.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.patch ide-remove-config_ide_arch_obsolete_init.patch ## # merge ide ## Auto-merged drivers/ide/ide.c Auto-merged include/linux/ide.h Merge made by recursive. Documentation/feature-removal-schedule.txt | 14 +- Documentation/ide.txt | 31 -- Documentation/ide/warm-plug-howto.txt | 13 + MAINTAINERS | 2 +- 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/ata/libata-core.c | 1 + drivers/ide/Kconfig | 29 +-- drivers/ide/Makefile | 2 +- drivers/ide/arm/bast-ide.c | 6 +- drivers/ide/arm/palm_bk3710.c | 4 +- drivers/ide/arm/rapide.c | 2 +- drivers/ide/cris/ide-cris.c | 18 +- drivers/ide/ide-acpi.c | 2 + drivers/ide/ide-cd.c | 10 +- drivers/ide/ide-disk.c | 1 + drivers/ide/ide-floppy.c | 346 +++++++----------- drivers/ide/ide-generic.c | 81 ++++- drivers/ide/ide-io.c | 38 ++- drivers/ide/ide-iops.c | 86 +++-- drivers/ide/ide-pnp.c | 2 +- drivers/ide/ide-probe.c | 127 ++++++-- drivers/ide/ide-proc.c | 3 - drivers/ide/ide-tape.c | 541 +++++++++++++--------------- drivers/ide/ide-taskfile.c | 29 +- drivers/ide/ide.c | 373 +++++-------------- drivers/ide/legacy/falconide.c | 2 +- drivers/ide/legacy/ht6560b.c | 13 +- drivers/ide/legacy/ide-cs.c | 8 +- drivers/ide/legacy/ide_platform.c | 2 +- drivers/ide/legacy/macide.c | 2 +- drivers/ide/mips/au1xxx-ide.c | 5 +- drivers/ide/pci/cmd640.c | 2 +- drivers/ide/pci/delkin_cb.c | 8 +- drivers/ide/pci/hpt366.c | 2 +- drivers/ide/pci/scc_pata.c | 8 +- drivers/ide/pci/sgiioc4.c | 19 +- drivers/ide/pci/sl82c105.c | 4 + drivers/ide/ppc/mpc8xx.c | 86 ++---- drivers/ide/ppc/pmac.c | 104 +----- drivers/ide/setup-pci.c | 11 - drivers/macintosh/mediabay.c | 17 +- drivers/scsi/ide-scsi.c | 203 +++++------ include/asm-alpha/ide.h | 3 - include/asm-ia64/ide.h | 2 - include/asm-m32r/ide.h | 2 - include/asm-mips/mach-generic/ide.h | 2 - include/asm-powerpc/ide.h | 49 ++- include/asm-powerpc/mediabay.h | 6 +- include/asm-x86/ide.h | 2 - include/linux/hdreg.h | 4 +- include/linux/ide.h | 171 ++++++---- 82 files changed, 1146 insertions(+), 1764 deletions(-) create mode 100644 Documentation/ide/warm-plug-howto.txt ## # 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/roland/infiniband.git for-2.6.26 infiniband ## Already up-to-date. ## # 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. drivers/firewire/fw-cdev.c | 8 +- drivers/firewire/fw-device.c | 48 ++++++--- drivers/firewire/fw-device.h | 2 +- drivers/firewire/fw-sbp2.c | 232 ++++++++++++++++++++++++++++-------------- drivers/ieee1394/sbp2.c | 12 ++ drivers/ieee1394/sbp2.h | 2 + 6 files changed, 207 insertions(+), 97 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/davem/net-2.6.git master net ## Merge made by recursive. drivers/net/e1000/e1000_ethtool.c | 2 +- drivers/net/e1000/e1000_main.c | 8 ++ drivers/net/e1000e/netdev.c | 34 +----- drivers/net/gianfar.c | 4 +- drivers/net/gianfar_mii.c | 4 +- drivers/net/hamradio/mkiss.c | 5 +- drivers/net/igb/igb_ethtool.c | 2 +- drivers/net/igb/igb_main.c | 28 ----- drivers/net/ixgb/ixgb_ethtool.c | 2 +- drivers/net/ixgbe/ixgbe_main.c | 41 ++++++-- drivers/net/pcmcia/smc91c92_cs.c | 12 ++- drivers/net/tsi108_eth.c | 72 ++++++++---- drivers/net/wireless/ath5k/base.c | 4 +- drivers/net/wireless/ath5k/hw.c | 34 +++--- drivers/net/wireless/b43/b43.h | 6 + drivers/net/wireless/b43/main.c | 40 ++++++- drivers/net/wireless/b43legacy/b43legacy.h | 4 + drivers/net/wireless/b43legacy/dma.c | 167 +++++++++++++++++---------- drivers/net/wireless/b43legacy/dma.h | 33 ++---- drivers/net/wireless/b43legacy/main.c | 41 ++++++- drivers/net/wireless/ipw2200.c | 45 ++++++-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 19 +++- drivers/net/wireless/iwlwifi/iwl4965-base.c | 17 ++- drivers/net/wireless/rndis_wlan.c | 14 +-- drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/wavelan.h | 6 +- net/mac80211/ieee80211.c | 5 +- 27 files changed, 405 insertions(+), 246 deletions(-) ## # git git://git.linux-nfs.org/pub/linux/nfs-2.6.git master nfs ## Already up-to-date. ## # git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus s390 ## Merge made by recursive. arch/s390/Kconfig | 3 +- arch/s390/kernel/process.c | 15 ++++++---- arch/s390/kernel/smp.c | 53 +++++++++++++++++++++++++++---------- arch/s390/kernel/time.c | 2 - drivers/s390/block/dasd.c | 12 ++++---- drivers/s390/char/sclp.c | 12 ++++---- drivers/s390/char/sclp.h | 6 +++- drivers/s390/char/sclp_config.c | 2 +- drivers/s390/char/sclp_cpi_sys.c | 2 +- drivers/s390/char/sclp_rw.c | 4 +- drivers/s390/char/sclp_vt220.c | 2 +- drivers/s390/cio/device.c | 15 +++++++++- drivers/s390/cio/qdio.c | 10 +----- drivers/s390/cio/qdio.h | 2 +- include/asm-s390/bitops.h | 20 ++++++++----- 15 files changed, 98 insertions(+), 62 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 upstream-linus ocfs2 ## BRANCH upstream-linus not in tree /pub/scm/linux/kernel/git/mfasheh/ocfs2.git, SKIPPING ## # git /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git for-linus selinux ## BRANCH for-linus not in tree /pub/scm/linux/kernel/git/jmorris/selinux-2.6.git, SKIPPING ## # 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 ## Merge made by recursive. arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh3/probe.c | 4 ++-- include/asm-sh/cpu-sh3/cache.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ## # 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 ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git master watchdog ## Already up-to-date. ## # gitfetch git://oss.sgi.com:8090/xfs/xfs-2.6.git master xfs ## ## # merge xfs resolve /home/jejb/xfs-fixup.diff ## MERGE xfs not in tree, SKIPPING ## # git /pub/scm/linux/kernel/git/czankel/xtensa-2.6.git testing xtensa ## Merge made by recursive. arch/xtensa/Kconfig | 34 ++- arch/xtensa/Makefile | 45 ++- arch/xtensa/boot/boot-elf/Makefile | 9 +- arch/xtensa/boot/boot-elf/{boot.ld => boot.lds.S} | 4 +- arch/xtensa/boot/boot-redboot/Makefile | 2 +- arch/xtensa/boot/boot-redboot/boot.ld | 2 +- arch/xtensa/kernel/asm-offsets.c | 17 +- arch/xtensa/kernel/coprocessor.S | 443 +++++++++++++------- arch/xtensa/kernel/entry.S | 355 ++++------------ arch/xtensa/kernel/module.c | 2 +- arch/xtensa/kernel/process.c | 306 +++++--------- arch/xtensa/kernel/ptrace.c | 351 +++++++++------- arch/xtensa/kernel/setup.c | 5 - arch/xtensa/kernel/signal.c | 89 +++-- arch/xtensa/kernel/traps.c | 20 +- arch/xtensa/kernel/vmlinux.lds.S | 6 +- arch/xtensa/mm/cache.c | 7 +- arch/xtensa/mm/init.c | 2 +- arch/xtensa/mm/misc.S | 2 +- .../{platform-iss => platforms/iss}/Makefile | 0 .../{platform-iss => platforms/iss}/console.c | 1 + arch/xtensa/{platform-iss => platforms/iss}/io.c | 0 .../{platform-iss => platforms/iss}/network.c | 2 +- .../xtensa/{platform-iss => platforms/iss}/setup.c | 0 include/asm-xtensa/cacheflush.h | 2 + include/asm-xtensa/coprocessor.h | 214 +++++++--- include/asm-xtensa/elf.h | 110 +---- include/asm-xtensa/module.h | 4 +- include/asm-xtensa/pgalloc.h | 2 +- include/asm-xtensa/pgtable.h | 8 +- include/asm-xtensa/processor.h | 13 +- include/asm-xtensa/ptrace.h | 44 +- include/asm-xtensa/regs.h | 9 +- include/asm-xtensa/sigcontext.h | 4 +- include/asm-xtensa/stat.h | 36 +- include/asm-xtensa/system.h | 39 +-- include/asm-xtensa/thread_info.h | 21 + include/asm-xtensa/timex.h | 8 +- include/asm-xtensa/uaccess.h | 99 +++--- include/asm-xtensa/variant-fsf/tie-asm.h | 70 +++ include/asm-xtensa/variant-fsf/tie.h | 75 +++- 41 files changed, 1262 insertions(+), 1200 deletions(-) rename arch/xtensa/boot/boot-elf/{boot.ld => boot.lds.S} (89%) rename arch/xtensa/{platform-iss => platforms/iss}/Makefile (100%) rename arch/xtensa/{platform-iss => platforms/iss}/console.c (98%) rename arch/xtensa/{platform-iss => platforms/iss}/io.c (100%) rename arch/xtensa/{platform-iss => platforms/iss}/network.c (99%) rename arch/xtensa/{platform-iss => platforms/iss}/setup.c (100%) create mode 100644 include/asm-xtensa/variant-fsf/tie-asm.h ## # git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git master x86 ## Merge made by recursive. arch/x86/kernel/head64.c | 3 + arch/x86/kernel/head_64.S | 7 +- arch/x86/mm/init_64.c | 27 ++++++ arch/x86/mm/pageattr.c | 208 ++++++++++++++++++++++-------------------- include/asm-x86/pgtable_64.h | 1 + 5 files changed, 146 insertions(+), 100 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 ## docbook-audit-prms.patch docbook-blk-prms.patch docbook-cpu-mtrr-prm.patch docbook-drv-base.patch docbook-skbuffh-prm.patch kerndoc-usb-hdr.patch ## # merge doc ## Merge made by recursive. Documentation/DocBook/kernel-api.tmpl | 2 + arch/x86/kernel/cpu/mtrr/main.c | 1 + block/blk-core.c | 2 + block/blk-settings.c | 1 - drivers/base/driver.c | 3 + drivers/base/power/main.c | 1 + include/linux/skbuff.h | 2 + include/linux/usb.h | 177 ++++++++++++++++++++------------- include/net/sock.h | 1 + kernel/audit.c | 4 +- 10 files changed, 121 insertions(+), 73 deletions(-) ## # check ## Differences exist, continuing ## # label ## Created commit 66fba63: 2.6.25-rc2-mc2 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- ##