* refs/heads/linus: fast forward to branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 old..new: d384e35..667984d Switched to branch "2.6.24-rc8-mc9" Finished one revert. * refs/heads/block-cfq-ioc-share: forcing update to non-fast forward branch 'cfq-ioc-share' of /pub/scm/linux/kernel/git/axboe/linux-2.6-block old...new: 146977f...79a772c Finished one revert. Switched to branch "ide" Switched to branch "2.6.24-rc8-mc9" Already on branch "2.6.24-rc8-mc9" Switched to branch "gregkh-everything" Space in indent is followed by a tab. .dotest/patch:46: 第一章：缩进 warning: 1 line adds whitespace errors. Space in indent is followed by a tab. .dotest/patch:156: security_kobj = kobject_create_and_add("security", &kernel_kset->kobj); warning: 1 line adds whitespace errors. Space in indent is followed by a tab. .dotest/patch:248: struct my_object *mine = container_of(kobj, struct my_object, kobj); warning: 1 line adds whitespace errors. Context reduced to (2/2) to apply fragment at 839 Space in indent is followed by a tab. .dotest/patch:55: 1. 3Mhz579 warning: 1 line adds whitespace errors. Switched to branch "2.6.24-rc8-mc9" Switched to branch "gregkh-everything" Adds trailing whitespace. patches/gregkh-everything/usb/usb-isd200-don-t-include-linux-ide.h.patch:69: US_DEBUGP(" Got ATA Register[IDE_ERROR_OFFSET] = 0x%x\n", Adds trailing whitespace. patches/gregkh-everything/usb/usb-isd200-don-t-include-linux-ide.h.patch:89: else if (regs[IDE_STATUS_OFFSET] & warning: 2 lines add whitespace errors. Already on branch "gregkh-everything" Switched to branch "2.6.24-rc8-mc9" * refs/heads/infiniband-for-linus: fast forward to branch 'for-linus' of /pub/scm/linux/kernel/git/roland/infiniband old..new: 0a69631..889c94a * refs/heads/infiniband-for-2.6.25: forcing update to non-fast forward branch 'for-2.6.25' of /pub/scm/linux/kernel/git/roland/infiniband old...new: 5e8a3c6...dae4713 Finished one revert. * refs/heads/scsi-post-merge: forcing update to non-fast forward branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-bidi-2.6 old...new: 8021af1...ec8800a 2o/i2o_scsi.c | 2 +- drivers/s390/scsi/zfcp_aux.c | 2 - drivers/s390/scsi/zfcp_ccw.c | 3 + drivers/s390/scsi/zfcp_dbf.c | 6 - drivers/s390/scsi/zfcp_def.h | 22 +- drivers/s390/scsi/zfcp_erp.c | 14 +- drivers/s390/scsi/zfcp_fsf.c | 70 +- drivers/s390/scsi/zfcp_scsi.c | 24 +- drivers/scsi/.gitignore | 2 - drivers/scsi/3w-9xxx.c | 1 + drivers/scsi/53c700.c | 11 +- drivers/scsi/BusLogic.c | 2 +- drivers/scsi/Kconfig | 32 +- drivers/scsi/Makefile | 5 +- drivers/scsi/NCR5380.c | 21 +- drivers/scsi/a2091.c | 36 +- drivers/scsi/a3000.c | 15 +- drivers/scsi/aacraid/aachba.c | 400 +++--- drivers/scsi/aacraid/aacraid.h | 335 +++-- drivers/scsi/aacraid/commctrl.c | 89 +- drivers/scsi/aacraid/comminit.c | 4 +- drivers/scsi/aacraid/commsup.c | 394 +++-- drivers/scsi/aacraid/dpcsup.c | 10 +- drivers/scsi/aacraid/linit.c | 242 ++- drivers/scsi/aacraid/rx.c | 6 +- drivers/scsi/advansys.c | 14 +- drivers/scsi/aha152x.c | 38 +- drivers/scsi/aha1542.c | 49 +- drivers/scsi/aha1740.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 6 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 6 +- drivers/scsi/aic7xxx_old.c | 11 +- drivers/scsi/aic94xx/aic94xx_dev.c | 6 +- drivers/scsi/aic94xx/aic94xx_dump.c | 4 +- drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- drivers/scsi/aic94xx/aic94xx_hwi.h | 3 + drivers/scsi/aic94xx/aic94xx_init.c | 190 +++- drivers/scsi/aic94xx/aic94xx_scb.c | 6 +- drivers/scsi/aic94xx/aic94xx_sds.c | 389 +++++ drivers/scsi/aic94xx/aic94xx_sds.h | 121 ++ drivers/scsi/aic94xx/aic94xx_task.c | 30 +- drivers/scsi/aic94xx/aic94xx_tmf.c | 12 +- drivers/scsi/arcmsr/arcmsr_hba.c | 6 +- drivers/scsi/atari_NCR5380.c | 24 +- drivers/scsi/atp870u.c | 102 +-- drivers/scsi/ch.c | 18 +- drivers/scsi/constants.c | 3 +- drivers/scsi/dc395x.c | 16 +- drivers/scsi/dpt_i2o.c | 5 +- drivers/scsi/eata.c | 4 +- drivers/scsi/eata_pio.c | 13 +- drivers/scsi/fd_mcs.c | 36 +- drivers/scsi/gdth.c | 22 +- drivers/scsi/hosts.c | 4 +- drivers/scsi/hptiop.c | 593 ++++++-- drivers/scsi/hptiop.h | 124 ++- drivers/scsi/ibmvscsi/ibmvscsi.c | 155 ++- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/imm.c | 13 +- drivers/scsi/in2000.c | 10 +- drivers/scsi/ipr.c | 2 +- drivers/scsi/ips.c | 326 ++--- drivers/scsi/ips.h | 32 +- drivers/scsi/iscsi_tcp.c | 2075 +++++++++++--------------- drivers/scsi/iscsi_tcp.h | 134 +- drivers/scsi/libiscsi.c | 1091 +++++++++----- drivers/scsi/libsas/Kconfig | 9 + drivers/scsi/libsas/Makefile | 1 + drivers/scsi/libsas/sas_ata.c | 2 +- drivers/scsi/libsas/sas_discover.c | 2 +- drivers/scsi/libsas/sas_expander.c | 35 +- drivers/scsi/libsas/sas_host_smp.c | 274 ++++ drivers/scsi/libsas/sas_internal.h | 16 +- drivers/scsi/libsas/sas_scsi_host.c | 9 +- drivers/scsi/libsrp.c | 23 +- drivers/scsi/lpfc/lpfc.h | 53 +- drivers/scsi/lpfc/lpfc_attr.c | 217 +++- drivers/scsi/lpfc/lpfc_crtn.h | 33 +- drivers/scsi/lpfc/lpfc_ct.c | 304 +++-- drivers/scsi/lpfc/lpfc_debugfs.c | 157 ++- drivers/scsi/lpfc/lpfc_disc.h | 2 +- drivers/scsi/lpfc/lpfc_els.c | 623 ++++++--- drivers/scsi/lpfc/lpfc_hbadisc.c | 372 +++-- drivers/scsi/lpfc/lpfc_hw.h | 112 ++- drivers/scsi/lpfc/lpfc_init.c | 429 ++++-- drivers/scsi/lpfc/lpfc_logmsg.h | 1 + drivers/scsi/lpfc/lpfc_mbox.c | 32 +- drivers/scsi/lpfc/lpfc_mem.c | 1 + drivers/scsi/lpfc/lpfc_nportdisc.c | 160 ++- drivers/scsi/lpfc/lpfc_scsi.c | 54 +- drivers/scsi/lpfc/lpfc_scsi.h | 1 + drivers/scsi/lpfc/lpfc_sli.c | 534 +++++--- drivers/scsi/lpfc/lpfc_sli.h | 12 +- drivers/scsi/lpfc/lpfc_version.h | 6 +- drivers/scsi/lpfc/lpfc_vport.c | 93 +- drivers/scsi/lpfc/lpfc_vport.h | 2 +- drivers/scsi/megaraid.c | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 6 +- drivers/scsi/megaraid/megaraid_sas.c | 572 ++++++-- drivers/scsi/megaraid/megaraid_sas.h | 18 +- drivers/scsi/ncr53c8xx.c | 3 +- drivers/scsi/pcmcia/Kconfig | 3 +- drivers/scsi/pcmcia/nsp_cs.c | 54 +- drivers/scsi/ppa.c | 12 +- drivers/scsi/psi240i.c | 689 --------- drivers/scsi/psi240i.h | 315 ---- drivers/scsi/psi_chip.h | 195 --- drivers/scsi/qla1280.c | 4 +- drivers/scsi/qla2xxx/Makefile | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 54 +- drivers/scsi/qla2xxx/qla_dbg.c | 37 +- drivers/scsi/qla2xxx/qla_dbg.h | 19 + drivers/scsi/qla2xxx/qla_def.h | 52 +- drivers/scsi/qla2xxx/qla_dfs.c | 175 +++ drivers/scsi/qla2xxx/qla_fw.h | 30 +- drivers/scsi/qla2xxx/qla_gbl.h | 51 +- drivers/scsi/qla2xxx/qla_init.c | 97 +- drivers/scsi/qla2xxx/qla_isr.c | 120 +- drivers/scsi/qla2xxx/qla_mbx.c | 430 ++---- drivers/scsi/qla2xxx/qla_mid.c | 46 +- drivers/scsi/qla2xxx/qla_os.c | 80 +- drivers/scsi/qla2xxx/qla_sup.c | 18 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla4xxx/ql4_init.c | 4 +- drivers/scsi/qla4xxx/ql4_isr.c | 11 +- drivers/scsi/qla4xxx/ql4_os.c | 7 +- drivers/scsi/qlogicpti.c | 31 +- drivers/scsi/scsi.c | 190 ++-- drivers/scsi/scsi_debug.c | 37 +- drivers/scsi/scsi_devinfo.c | 34 +- drivers/scsi/scsi_error.c | 131 +- drivers/scsi/scsi_ioctl.c | 26 +- drivers/scsi/scsi_lib.c | 117 +- drivers/scsi/scsi_netlink.c | 19 +- drivers/scsi/scsi_proc.c | 110 ++- drivers/scsi/scsi_scan.c | 36 +- drivers/scsi/scsi_sysfs.c | 1 + drivers/scsi/scsi_tgt_if.c | 2 +- drivers/scsi/scsi_tgt_lib.c | 30 +- drivers/scsi/scsi_transport_fc.c | 102 +- drivers/scsi/scsi_transport_iscsi.c | 330 +++-- drivers/scsi/scsi_transport_sas.c | 41 +- drivers/scsi/scsi_transport_spi.c | 258 +++- drivers/scsi/scsi_transport_srp.c | 13 +- drivers/scsi/scsicam.c | 35 +- drivers/scsi/sd.c | 44 +- drivers/scsi/seagate.c | 1667 --------------------- drivers/scsi/sg.c | 22 +- drivers/scsi/sgiwd93.c | 1 + drivers/scsi/sr.c | 35 +- drivers/scsi/sr.h | 4 + drivers/scsi/sr_ioctl.c | 48 +- drivers/scsi/st.c | 9 +- drivers/scsi/sun3_NCR5380.c | 24 +- drivers/scsi/sym53c416.c | 16 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 22 +- drivers/scsi/tmscsim.c | 6 +- drivers/scsi/u14-34f.c | 4 +- drivers/scsi/ultrastor.c | 2 +- drivers/scsi/wd33c93.c | 10 +- drivers/scsi/wd7000.c | 12 +- drivers/usb/storage/freecom.c | 14 +- drivers/usb/storage/isd200.c | 66 +- drivers/usb/storage/protocol.c | 126 +- drivers/usb/storage/scsiglue.c | 20 +- drivers/usb/storage/sddr09.c | 9 +- drivers/usb/storage/shuttle_usbat.c | 68 +- drivers/usb/storage/transport.c | 45 +- drivers/usb/storage/transport.h | 2 + fs/sysfs/file.c | 11 +- fs/sysfs/group.c | 26 +- include/linux/attribute_container.h | 1 + include/linux/blkdev.h | 1 + include/linux/sysfs.h | 2 + include/scsi/iscsi_if.h | 20 + include/scsi/iscsi_proto.h | 14 +- include/scsi/libiscsi.h | 82 +- include/scsi/libsas.h | 24 +- include/scsi/sas.h | 13 +- include/scsi/scsi_device.h | 13 +- include/scsi/scsi_transport_iscsi.h | 10 +- include/scsi/scsi_transport_sas.h | 16 +- include/scsi/sd.h | 1 + kernel/params.c | 2 +- 207 files changed, 10250 insertions(+), 8838 deletions(-) create mode 100644 Documentation/DocBook/scsi.tmpl delete mode 100644 Documentation/scsi/ncr53c7xx.txt create mode 100644 drivers/scsi/aic94xx/aic94xx_sds.h create mode 100644 drivers/scsi/libsas/sas_host_smp.c delete mode 100644 drivers/scsi/psi240i.c delete mode 100644 drivers/scsi/psi240i.h delete mode 100644 drivers/scsi/psi_chip.h create mode 100644 drivers/scsi/qla2xxx/qla_dfs.c delete mode 100644 drivers/scsi/seagate.c ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block sg block-sg ## Auto-merged drivers/scsi/scsi_lib.c Auto-merged drivers/scsi/scsi_tgt_lib.c Auto-merged include/linux/scatterlist.h Auto-merged include/scsi/scsi_cmnd.h Merge made by recursive. drivers/ide/arm/icside.c | 6 +- drivers/ide/cris/ide-cris.c | 2 +- drivers/ide/ide-dma.c | 8 +- drivers/ide/ide-io.c | 2 +- drivers/ide/ide-probe.c | 6 +- drivers/ide/ide-taskfile.c | 2 +- drivers/ide/ide.c | 2 +- drivers/ide/mips/au1xxx-ide.c | 8 +- drivers/ide/pci/sgiioc4.c | 4 +- drivers/ide/ppc/pmac.c | 6 +- drivers/scsi/ide-scsi.c | 2 +- drivers/scsi/scsi_lib.c | 138 +++----------------- drivers/scsi/scsi_tgt_lib.c | 3 +- include/linux/ide.h | 2 +- include/linux/scatterlist.h | 125 ++++--------------- include/scsi/scsi_cmnd.h | 7 +- lib/Makefile | 2 +- lib/scatterlist.c | 281 +++++++++++++++++++++++++++++++++++++++++ 18 files changed, 354 insertions(+), 252 deletions(-) create mode 100644 lib/scatterlist.c ## # revert 08aac8fcb774b9ec2dd08aaa5c526b236a897071 ## Created commit 8b24f4d: Revert "SG: Update ide/ to use sg_table" 12 files changed, 27 insertions(+), 23 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block cfq-ioc-share block-cfq-ioc-share ## Auto-merged block/ll_rw_blk.c Auto-merged include/linux/blkdev.h Merge made by recursive. block/as-iosched.c | 34 +++++- block/cfq-iosched.c | 289 ++++++++++++++++++++++++++------------------- block/ll_rw_blk.c | 94 ++++++++++----- fs/ioprio.c | 28 +++-- include/linux/blkdev.h | 77 +------------ include/linux/init_task.h | 1 - include/linux/iocontext.h | 95 +++++++++++++++ include/linux/ioprio.h | 13 +- include/linux/sched.h | 2 +- kernel/fork.c | 36 +++++- 10 files changed, 412 insertions(+), 257 deletions(-) create mode 100644 include/linux/iocontext.h ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block blk-end-request block-blk-end-request ## Auto-merged block/ll_rw_blk.c Auto-merged drivers/block/cciss.c Auto-merged drivers/ide/ide-cd.c Auto-merged drivers/scsi/scsi_lib.c Auto-merged include/linux/blkdev.h Merge made by recursive. arch/arm/plat-omap/mailbox.c | 16 +-- arch/um/drivers/ubd_kern.c | 16 +-- block/ll_rw_blk.c | 298 ++++++++++++++++++++++++++++----------- drivers/block/DAC960.c | 11 +-- drivers/block/cciss.c | 25 +--- drivers/block/cpqarray.c | 36 +---- drivers/block/floppy.c | 16 +-- drivers/block/nbd.c | 8 +- drivers/block/ps3disk.c | 12 +- drivers/block/sunvdc.c | 11 +- drivers/block/sx8.c | 58 ++++---- drivers/block/ub.c | 10 +- drivers/block/viodasd.c | 15 +-- drivers/block/xen-blkfront.c | 10 +- drivers/block/xsysace.c | 5 +- drivers/cdrom/viocd.c | 15 +-- drivers/ide/ide-cd.c | 55 +++++--- drivers/ide/ide-io.c | 25 ++-- drivers/message/i2o/i2o_block.c | 20 +-- drivers/mmc/card/block.c | 24 +--- drivers/mmc/card/queue.c | 4 +- drivers/s390/block/dasd.c | 19 ++-- drivers/s390/char/tape_block.c | 13 +- drivers/scsi/ide-scsi.c | 8 +- drivers/scsi/scsi_lib.c | 31 ++--- include/linux/blkdev.h | 31 +++-- 26 files changed, 417 insertions(+), 375 deletions(-) ## # revert e479c022688fcfaadf76b01eb159a4a5f33ea8cc ## Auto-merged drivers/ide/ide-cd.c Created commit fc2a965: Revert "blk_end_request: changing ide-cd (take 4)" 1 files changed, 14 insertions(+), 35 deletions(-) ## # git /pub/scm/linux/kernel/git/axboe/linux-2.6-block for-2.6.25 block-for-2.6.25 ## Auto-merged block/blktrace.c Auto-merged drivers/block/cciss.c Auto-merged drivers/scsi/sg.c Auto-merged include/linux/blkdev.h Merge made by recursive. block/blktrace.c | 24 ++++++++++++++---------- block/compat_ioctl.c | 5 ++++- drivers/scsi/sg.c | 12 ++++++++++++ include/linux/blkdev.h | 7 +------ include/linux/blktrace_api.h | 12 ++++++++++-- 5 files changed, 41 insertions(+), 19 deletions(-) ## # quilt /pub/linux/kernel/people/bart/pata-2.6/patches/. ide ## building file list ... done sent 21390 bytes received 20 bytes 14273.33 bytes/sec total size is 1378958 speedup is 64.41 hpt366-change-timing-register-masks.patch hpt366-kill-set_dma_mode-method-wrapper.patch hpt366-merge-set_dma_mode-methods.patch ide-remove-dma-master-field-from-ide-hwif-t-take-5.patch ide-remove-task-ioreg-t-typedef-take-2.patch ide-add-struct-ide_taskfile-take-2.patch ide-disk-merge-lba28-and-lba48-host-protected-area-support-code-take-2.patch ide-disk-fix-taskfile-registers-loading-order-in-__ide_do_rw_disk.patch ide-disk-use-struct-ide_taskfile-in-__ide_do_rw_disk.patch ide-add-ide_tf_load-helper.patch ide-add-ide_no_data_taskfile-helper.patch ide-use-do-rw-taskfile-in-flagged-taskfile.patch ide-pmac-fix-pmac_ide_init_hwif_ports.patch ide-remove-irqf_disabled-from-irq-flags-for-ide-irq-handler.patch ide-remove-config_idepci_share_irq-config-option.patch ide-remove-stale-ide-h-configuration-options.patch ide-tape-remove-dead-use_iotrace-code.patch ide-fix-registers-loading-order-for-win_smart-in-execute_drive_cmd.patch ide-fix-registers-loading-order-for-ide_nsector_reg-in-execute_drive_cmd.patch ide-execute_drive_cmd-cleanup.patch ide-remove-ide_cmd-helper.patch ide-use-ide_tf_load-in-execute_drive_cmd.patch ide-use-ide_tflag_lba48-for-req_type_ata_taskfile-requests.patch ide-remove-unnecessary-writes-to-hob-taskfile-registers.patch ide-extend-timeout-for-req_type_ata_cmd_task-requests.patch ide-switch-idedisk_prepare_flush-to-use-req_type_ata_taskfile-requests.patch ide-switch-ide_task_ioctl-to-use-req_type_ata_taskfile-requests.patch ide-remove-req_type_ata_task.patch ide-floppy-remove-dead-code.patch ide-cpu-endianness-doesn-t-matter-for-special_t.patch ide-remove-ata_status_t-and-atapi_status_t.patch ide-remove-atapi_error_t-take-2.patch ide-remove-atapi_feature_t.patch ide-remove-ata_nsector_t-ata_data_t-and-atapi_bcount_t.patch ide-remove-atapi_ireason_t-take-3.patch ide-cd-fix-register-loading-order-in-cdrom_start_packet_command.patch ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command.patch ide-add-ide_pktcmd_tf_load-helper.patch ide-remove-quirk_list.patch ide-remove-select_interrupt.patch ide-remove-hwif-intrproc.patch ide-remove-command-type-field-from-ide_task_t.patch ide-remove-tf_in_flags-field-from-ide_task_t.patch sc1200-remove-pointless-hwif-lookup-loop.patch ide-disk-fix-__ide_do_rw_disk-to-use-outbsync.patch ide-disk-guarantee-400ns-delay-after-writing-command-register.patch ide-merge-flagged_taskfile-into-do_rw_taskfile.patch ide-convert-do_rw_taskfile-to-use-data_phase.patch ide-use-data_phase-to-set-handler-in-do_rw_taskfile.patch ide-remove-handler-field-from-ide_task_t-take-2.patch ide-disk-extend-timeout-for-pio-out-commands.patch ide-disk-add-ide_tf_set_cmd-helper.patch ide-disk-use-do_rw_taskfile-take-2.patch ide-fix-registers-loading-order-in-ide_dump_ata_status.patch ide-add-ide_tf_read-helper.patch ide-printk-fix.patch ide-disk-use-ide_get_lba_addr.patch ide-kill-duplicate-code-in-ide_dump_ata_atapi_status.patch ide-make-extra-field-in-struct-ide_port_info-u8.patch pdc202xx_new-move-pio-programming-code-to-pdcnew_set_pio_mode.patch sis5513-factor-out-udma-programming-code.patch ide-add-ide_hflag_abuse_set_dma_mode-host-flag.patch sc1200-move-dma-timings-to-timing-tables.patch ide-remove-redundant-ide_dma_on-call-from-set_using_dma.patch ide-cleanup-ide_set_dma.patch ide-remove-redundant-dma-blacklist-check-from-__ide_dma_on.patch sl82c105-program-dma-pio-timings-in-dma_start-and-ide_dma_end.patch sl82c105-remove-no-longer-needed-selectproc-method.patch serverworks-cleanup-set_dma_mode-method.patch ide-disk-add-idedisk_set_doorlock-helper.patch ide-hopefully-fix-vdma-for-cs5520.patch cy82c693-correct-dma-modes-clipping.patch cy82c693-add-set_dma_mode-method.patch sgiioc4-add-ide_toggle_bounce-calls.patch icside-add-ide_toggle_bounce-calls.patch au1xxx-ide-add-ide_toggle_bounce-calls.patch ide-remove-ide_dma_on-and-dma_off_quietly-methods-from-ide_hwif_t.patch ide-cris-fix-dma-methods.patch atiixp-remove-dma_host_on-and-dma_host_off-methods.patch ide-move-drive-using_dma-check-to-callers-of-dma_host_on-method.patch ide-merge-dma_host_-on-off-methods-into-dma_host_set-method.patch ide-dump-taskfile-hob-registers-in-ide_tf_load-if-debug-is-defined.patch ide-merge-fixup-and-quirkproc-methods.patch ide-dont-try-to-unregister-interfaces-if-initializing-in-ide_register_hw.patch ide-kill-probe_hwif_init.patch ide-fix-probing-for-hosts-with-serialized-or-irq-sharing-interfaces.patch rapide-set-hwif-chipset.patch swarm-set-hwif-chipset.patch ide-add-hwif-chipset-fixup-to-ide_device_add.patch ide-remove-ideprobe_init.patch ide-fix-build-break-caused-by-ide-remove-ideprobe_init.patch sgiioc4-always-init-hwif-io_ports.patch ide-add-ide_init_port_hw-helper.patch ide-drop-initializing-argument-from-ide_register_hw.patch ide-move-ide_arm_init-call-from-init_ide_data-to-ide_init.patch cmd640-fix-dependency-on-ide_generic.patch ide-fix-host-drivers-depending-on-ide_generic-to-probe-for-interfaces-take-2.patch ide-make-remaining-built-in-only-ide-host-drivers-modular.patch au1xxx-ide-au_ide_probe-fix.patch au1xxx-ide-use-ide_init_port_hw.patch ide-always-use-ide_std_init_ports-in-setup-pci-c.patch ide-use-ide_init_port_hw-in-setup-pci-c.patch rapide-remove-write-only-hwif-hwif_data.patch ide-pmac-use-custom-hwif-sg_max_nents-only-if-dma-support-is-enabled.patch ide-add-ide_set_irq-inline-helper.patch ide-print-banner-message-once-per-controller-in-m68k-host-drivers.patch ide-move-config_idepci_pcibus_order-code-to-ide-scan-pci-c.patch ide-make-config_idepci_pcibus_order-visible-and-deprecate-it.patch ide-add-ide_busy_sleep-helper.patch ide-remove-broken-disk-byte-swapping-support.patch cmd64x-remove-proc-ide-cmd64x.patch ide-fix-io_32bit-race-in-ide_taskfile_ioctl.patch ide-clear-hob-bit-for-req_type_ata_cmd-requests-in-ide_end_drive_cmd.patch ide-fix-final-status-check-in-task_in_intr.patch ide-tape-fix-handling-of-non-special-requests-in-end_request-method.patch ide-set-ide_tflag_in-flags-before-queuing-executing-command.patch ide-remove-needless-cursg-clearing-from-task_end_request.patch ide-use-rq-nr_sectors-in-task_end_request.patch ide-task_end_request-fix.patch ide-kill-data_ready-define.patch ide-use-wait_drive_not_busy-in-drive_cmd_intr-take-2.patch ide-initialize-rq-cmd_type-in-ide_init_drive_cmd-callers.patch ide-convert-empty-req_type_ata_cmd-requests-to-use-req_type_ata_taskfile.patch ide-dont-enable-local-irqs-for-pio-in-in-driver_cmd_intr-take-2.patch ide-check-busy-and-error-status-bits-before-reading-data-in-drive_cmd_intr.patch ide-fix-final-status-check-in-drive_cmd_intr.patch ide-switch-set_xfer_rate-to-use-req_type_ata_taskfile-requests.patch ide-switch-ide_cmd_ioctl-to-use-req_type_ata_taskfile-requests.patch ide-remove-req_type_ata_cmd.patch ide-cd-use-xfer_func_t-in-cdrom_pc_intr.patch ide-cd-add-ide_cd_pad_transfer-helper.patch ide-cd-fix-missing-data-handling-in-cdrom_pc_intr.patch ide-cd-fix-dma-error-handling-in-cdrom_newpc_intr.patch ide-cd-fix-trailing-whitespaces-in-changelog.patch ide-cd-move-historical-changelog-to-documentation-ide-changelog-ide-cd-1994-2004.patch ide-cd-remove-stale-cdrom_transfer_packet_command-comment.patch ide-cd-remove-unused-defines-from-ide-cd-h.patch ide-cd-remove-dead-code-from-cdrom_pc_intr.patch ide-cd-remove-unused-struct-atapi_cdrom_subchnl.patch ide-cd-remove-needless-zeroing-of-info-fields-from-ide_cdrom_setup.patch ide-cd-remove-unused-and-write-only-struct-ide_cd_config_flags-fields.patch ide-cd-remove-struct-atapi_mechstat_header-changer_info-slot.patch ide-cd-cleanup-ide_cdrom_update_speed.patch ide-cd-add-ide_cd_capabilities-define.patch ide-cd-remove-redundant-config-flags.patch ide-cd-kill-cdrom_config_flags-macro.patch ide-cd-kill-cdrom_state_flags-macro.patch ide-cd-remove-struct-atapi_capabilities_page-take-2.patch ide-cd-remove-struct-ide_cd_config-state_flags.patch ide-cd-remove-no_door_locking-define.patch ide-cd-remove-standard_atapi-define.patch ide-cd-use-bcd2bin-bin2bcd-macros-from-linux-bcd-h.patch ide-cd-re-organize-handling-of-quirky-devices.patch ide-cd-remove-duplicate-sense-keys-definitions-from-ide-cd-h.patch ide-cd-coding-style-fixes-for-verbose_ide_cd_errors-code.patch ide-cd-move-verbose_ide_cd_errors-code-to-ide-cd_verbose-c.patch ide-cd-factor-out-ioctl-handlers-from-ide_cdrom_audio_ioctl.patch ide-cd-merge-cdrom_play_audio-into-ide_cd_fake_play_trkind.patch ide-cd-merge-cdrom_read_subchannel-into-ide_cdrom_get_mcn.patch ide-cd-merge-cdrom_select_speed-into-ide_cdrom_select_speed.patch ide-cd-move-lba_to_msf-and-msf_to_lba-to-linux-cdrom-h.patch ide-cd-coding-style-fixes-for-cdrom_get_toc_entry.patch ide-cd-rename-cdrom_-functions-to-ide_cd_.patch ide-cd-move-code-handling-cdrom-c-ioctls-to-ide-cd_ioctl-c.patch ide-cd-remove-bug_on-from-cdrom_newpc_intr.patch ide-cd-call-blk_dump_rq_flags-on-missing-data-in-cdrom_newpc_intr.patch ide-cd-factor-out-request-sense-fixup-from-cdrom_pc_intr.patch ide-cd-unify-request-end-exit-path-in-cdrom_pc_intr.patch ide-cd-merge-cdrom_pc_intr-and-cdrom_newpc_intr.patch ide-cd-remove-cdrom_do_pc_continuation.patch ide-cd-merge-cdrom_do_packet_command-and-cdrom_do_block_pc.patch ide-cd-add-ide_cd_drain_data-helper.patch ide-cd-factor-out-transfer-size-checking-from-cdrom_read_intr.patch ide-cd-merge-cdrom_read_intr-and-cdrom_write_intr.patch ide-cd-merge-cdrom_start_read_continuation-and-cdrom_start_write_cont.patch ide-cd-merge-cdrom_start_read-and-cdrom_start_write.patch ide-cd-unify-moving-to-the-next-buffer-in-cdrom_rw_intr.patch ide-cd-prepare-cdrom_rw_intr-and-cdrom_newpc_intr-to-be-merged.patch ide-cd-call-blk_dump_rq_flags-on-missing-data-in-cdrom_rw_intr.patch ide-cd-merge-cdrom_rw_intr-and-cdrom_newpc_intr.patch ide-cd-merge-cdrom_write_check_ireason-and-cdrom_read_check_ireason.patch ide-cd-unify-request-end-exit-path-in-cdrom_decode_status.patch ide-cd-update-driver-version-comments-and-copyrights.patch ide-add-ide_dump_identify-debug-helper.patch ide-floppy-tape-remove-debug-code-for-dumping-identify-data.patch ide-cd-move-the-remaining-cdrom-c-ioctl-handling-code-to-ide-cd_ioctl-c-v2.patch trm290-cannot-call-ide_setup_dma.patch ide-ide_setup_dma-assumes-8-ports.patch amd74xx-remove-amd_ide_chips-table.patch ide-add-ide_hflag_clear_simplex-host-flag.patch ide-add-ide_hflag_no_dsc-host-flag.patch piix-remove-stale-comments.patch ide-fix-ide_intr-for-non-pci-devices-and-config_blk_dev_idepci-y.patch ide-remove-bug_on-from-ide_build_sglist.patch ide-use-ide_destroy_dmatable-instead-of-pci_unmap_sg-take-2.patch ide-keep-pointer-to-struct-device-instead-of-struct-pci_dev-in-ide_hwif_t.patch au1xxx-ide-use-hwif-dev.patch icside-use-hwif-dev.patch ide-switch-to-dma-mapping-api.patch ide-use-ide_build_sglist-and-ide_destroy_dmatable-in-non-pci-host-drivers.patch au1xxx-ide-device-tree-bugfix.patch ide-pmac-macio-resource-freeing-bugfix.patch au1xxx-ide-rapide-use-hwif-index-for-ide_unregister.patch ide-delete-filenames-versions-from-comments.patch ide-update-add-my-copyrights.patch ide-floppy-cleanup-header.patch ide-dont-include-linux-hdsmart-h.patch linux-hdsmart-h-is-not-used-by-kernel-code.patch ide-fix-handling-of-busy-io-resources-in-probe_hwif.patch ide-move-wait_hwif_ready-documentation-in-the-right-place.patch ide-remove-hwif-present-manipulations-from-hwif_init.patch ide_platform-remove-struct-hwif_prop.patch ide-remove-unused-ide_hwgroup_t-fields.patch ide-remove-needless-zeroing-of-hwgroup-fields-from-init_irq.patch ide-cleanup-ide_system_bus_speed.patch ide-io-resources-are-released-too-early-in-ide_unregister.patch ide-factor-out-code-removing-port-from-hwgroup-from-ide_unregister.patch ide-prepare-init_irq-for-using-ide_remove_port_from_hwgroup.patch ide-use-ide_remove_port_from_hwgroup-in-init_irq.patch ide-make-probe_hwif-return-an-error-value.patch ide-move-handling-of-io-resources-out-of-ide_probe_port.patch ide-factor-out-code-for-tuning-devices-from-ide_probe_port.patch ide-move-hwif_register-call-out-of-ide_probe_port.patch dtc2278-fix-io_32bit-handling.patch au1xxx-ide-fix-io_32bit-handling.patch atiixp-cs5535-scc_pata-fix-idex-ata66-parameter-handling.patch macide-remove-drive-capacity64-quirk.patch ide-always-set-dma-masks-in-ide_pci_setup_ports.patch ide-separate-pci-specific-init-from-generic-init-in-ide_pci_setup_ports.patch ide-add-struct-ide_port_info-instances-to-legacy-host-drivers.patch ide-add-cable-detect-method-to-ide_hwif_t.patch ide-remove-needless-includes-from-pci-host-drivers.patch ide-floppy-convert-to-generic-packet-commands.patch ide-floppy-replace-ntoh-s-l-and-hton-s-l-calls-with-the-generic-byteorder.patch ide-floppy-remove-unnecessary-handler-ne-null-check.patch ide-floppy-disambiguate-function-names.patch ide-floppy-include-the-proper-headers.patch ide-floppy-cleanup-and-unify-debugging-macro-calls.patch ide-floppy-remove-struct-idefloppy_capabilities_page.patch ide-floppy-remove-struct-idefloppy_inquiry_result.patch ide-floppy-remove-struct-idefloppy_request_sense_result.patch ide-floppy-remove-struct-idefloppy_mode_parameter_header.patch ide-floppy-remove-struct-idefloppy_flexible_disk_page.patch ide-floppy-remove-struct-idefloppy_capacity_descriptor.patch ide-floppy-factor-out-ioctl-handlers-from-idefloppy_ioctl.patch ide-floppy-report-dma-handling-in-idefloppy_pc_intr-properly.patch ide-floppy-mv-idefloppy_-should_-report_error.patch ide-floppy-remove-idefloppy_debug_bugs-macro.patch ide-floppy-use-an-xfer_func_t-and-io_buf_t-typedefs-in-order-to-unify-rw.patch ide-floppy-merge-idefloppy_-input-output-_buffers.patch ide-floppy-remove-unused-idefloppy_use_read12.patch ide-floppy-remove-idefloppy_debug_info.patch ide-floppy-remove-unused-flag-pc_abort.patch ide-floppy-remove-atomic-test_-bit-macros.patch ide-floppy-fix-most-of-the-remaining-checkpatch-pl-issues.patch ide-floppy-bump-driver-version-number.patch pdc202xx_old-remove-surplus-initialiser.patch ide-remove-redundant-hwif-present-check-from-ide_register_hw.patch ide-remove-redundant-init_hwif_default-call-from-ide_register_hw.patch ide-add-init_default-and-restore-arguments-to-ide_unregister.patch ide-add-ide_deprecated_find_port-helper.patch ide-fix-ide_unregister-usage-in-host-drivers.patch ide-factor-out-code-initializing-devices-from-ide_init_port.patch ide-add-ide_hflag_no_-io32_bit-unmask_irqs-host-flags.patch ide-add-init_port_devs-method-to-ide_hwif_t.patch ide-remove-incorrect-init_gendisk-comment.patch ide-skip-not-present-devices-in-init_gendisk.patch ide-move-blk_register_region-call-out-from-init_gendisk.patch ide-call-init_gendisk-after-ide_acpi_init.patch ide-merge-init_gendisk-into-hwif_register_devices.patch ide-move-hwif-rqsize-init-from-ide_init_queue-to-init_irq.patch ide-factor-out-adding-drive-to-hwgroup-from-init_irq.patch ide-factor-out-devices-setup-from-init_irq.patch ide-move-ide_acpi_init-call-to-ide_device_add_all.patch ide-acpi-remove-needless-exports.patch ide-acpi-remove-dead-code-from-do_drive_get_gtf.patch ide-factor-out-devices-setup-from-ide_acpi_init.patch ide-move-hwif-present-check-out-from-ide_proc_register_port.patch ide-move-create_proc_ide_drives-call-to-ide_device_add_all.patch ## # merge ide ## Auto-merged drivers/ide/ide-cd.c Auto-merged drivers/ide/ide-io.c Auto-merged drivers/scsi/ide-scsi.c Auto-merged include/linux/blkdev.h Merge made by recursive. Documentation/ide.txt | 13 +- Documentation/ide/ChangeLog.ide-cd.1994-2004 | 268 +++ Documentation/ide/ChangeLog.ide-floppy.1996-2002 | 63 + drivers/cdrom/cdrom.c | 6 - drivers/ide/Kconfig | 67 +- drivers/ide/Makefile | 62 +- drivers/ide/arm/Makefile | 4 + drivers/ide/arm/bast-ide.c | 23 +- drivers/ide/arm/icside.c | 100 +- drivers/ide/arm/ide_arm.c | 17 +- drivers/ide/arm/rapide.c | 41 +- drivers/ide/cris/Makefile | 2 +- drivers/ide/cris/ide-cris.c | 50 +- drivers/ide/h8300/Makefile | 2 + drivers/ide/h8300/ide-h8300.c | 28 +- drivers/ide/ide-acpi.c | 80 +- drivers/ide/ide-cd.c | 2335 +++++----------------- drivers/ide/ide-cd.h | 706 +------ drivers/ide/ide-cd_ioctl.c | 475 +++++ drivers/ide/ide-cd_verbose.c | 359 ++++ drivers/ide/ide-disk.c | 446 ++--- drivers/ide/ide-dma.c | 238 +-- drivers/ide/ide-floppy.c | 1662 ++++++---------- drivers/ide/ide-generic.c | 8 +- drivers/ide/ide-io.c | 340 ++-- drivers/ide/ide-iops.c | 81 +- drivers/ide/ide-lib.c | 234 +-- drivers/ide/ide-pnp.c | 33 +- drivers/ide/ide-probe.c | 618 +++--- drivers/ide/ide-proc.c | 21 +- drivers/ide/ide-scan-pci.c | 121 ++ drivers/ide/ide-tape.c | 209 +-- drivers/ide/ide-taskfile.c | 631 +++--- drivers/ide/ide-timing.h | 2 - drivers/ide/ide.c | 387 ++--- drivers/ide/legacy/Makefile | 19 +- drivers/ide/legacy/ali14xx.c | 31 +- drivers/ide/legacy/buddha.c | 46 +- drivers/ide/legacy/dtc2278.c | 41 +- drivers/ide/legacy/falconide.c | 24 +- drivers/ide/legacy/gayle.c | 45 +- drivers/ide/legacy/ht6560b.c | 55 +- drivers/ide/legacy/ide-cs.c | 29 +- drivers/ide/legacy/ide_platform.c | 77 +- drivers/ide/legacy/macide.c | 52 +- drivers/ide/legacy/q40ide.c | 26 +- drivers/ide/legacy/qd65xx.c | 74 +- drivers/ide/legacy/qd65xx.h | 2 - drivers/ide/legacy/umc8672.c | 31 +- drivers/ide/mips/au1xxx-ide.c | 110 +- drivers/ide/mips/swarm.c | 3 +- drivers/ide/pci/Makefile | 4 + drivers/ide/pci/aec62xx.c | 48 +- drivers/ide/pci/alim15x3.c | 29 +- drivers/ide/pci/amd74xx.c | 303 ++-- drivers/ide/pci/atiixp.c | 109 +- drivers/ide/pci/cmd640.c | 49 +- drivers/ide/pci/cmd64x.c | 148 +-- drivers/ide/pci/cs5520.c | 34 +- drivers/ide/pci/cs5530.c | 12 +- drivers/ide/pci/cs5535.c | 12 +- drivers/ide/pci/cy82c693.c | 70 +- drivers/ide/pci/delkin_cb.c | 45 +- drivers/ide/pci/generic.c | 12 +- drivers/ide/pci/hpt34x.c | 25 +- drivers/ide/pci/hpt366.c | 321 ++-- drivers/ide/pci/it8213.c | 48 +- drivers/ide/pci/it821x.c | 95 +- drivers/ide/pci/jmicron.c | 11 +- drivers/ide/pci/ns87415.c | 24 +- drivers/ide/pci/opti621.c | 17 +- drivers/ide/pci/pdc202xx_new.c | 93 +- drivers/ide/pci/pdc202xx_old.c | 67 +- drivers/ide/pci/piix.c | 81 +- drivers/ide/pci/rz1000.c | 14 +- drivers/ide/pci/sc1200.c | 200 +-- drivers/ide/pci/scc_pata.c | 37 +- drivers/ide/pci/serverworks.c | 75 +- drivers/ide/pci/sgiioc4.c | 89 +- drivers/ide/pci/siimage.c | 103 +- drivers/ide/pci/sis5513.c | 133 +- drivers/ide/pci/sl82c105.c | 136 +- drivers/ide/pci/slc90e66.c | 44 +- drivers/ide/pci/tc86c001.c | 32 +- drivers/ide/pci/triflex.c | 11 +- drivers/ide/pci/trm290.c | 76 +- drivers/ide/pci/via82cxxx.c | 26 +- drivers/ide/ppc/Makefile | 3 + drivers/ide/ppc/mpc8xx.c | 20 +- drivers/ide/ppc/pmac.c | 214 +-- drivers/ide/setup-pci.c | 320 +--- drivers/macintosh/mediabay.c | 5 +- drivers/scsi/ide-scsi.c | 80 +- include/asm-cris/arch-v10/ide.h | 5 - include/asm-cris/arch-v32/ide.h | 5 - include/asm-frv/ide.h | 6 - include/asm-mips/mach-au1x00/au1xxx_ide.h | 1 - include/asm-powerpc/ide.h | 3 - include/linux/blkdev.h | 2 - include/linux/cdrom.h | 15 + include/linux/hdreg.h | 64 +- include/linux/hdsmart.h | 2 + include/linux/ide.h | 448 ++--- 103 files changed, 5910 insertions(+), 8313 deletions(-) create mode 100644 Documentation/ide/ChangeLog.ide-cd.1994-2004 create mode 100644 Documentation/ide/ChangeLog.ide-floppy.1996-2002 create mode 100644 drivers/ide/h8300/Makefile create mode 100644 drivers/ide/ide-cd_ioctl.c create mode 100644 drivers/ide/ide-cd_verbose.c create mode 100644 drivers/ide/ide-scan-pci.c create mode 100644 drivers/ide/ppc/Makefile ## # 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 ## Auto-merged drivers/ata/libata-scsi.c Auto-merged drivers/ata/pata_pdc202xx_old.c Auto-merged drivers/scsi/ipr.c Auto-merged drivers/scsi/libsas/sas_ata.c Auto-merged include/linux/cdrom.h Merge made by recursive. drivers/ata/Kconfig | 9 + drivers/ata/Makefile | 1 + drivers/ata/ahci.c | 45 +-- drivers/ata/ata_generic.c | 44 ++- drivers/ata/ata_piix.c | 61 ++-- drivers/ata/libata-acpi.c | 117 +++++-- drivers/ata/libata-core.c | 819 +++++++++++++++++++-------------------- drivers/ata/libata-eh.c | 300 +++++++++++---- drivers/ata/libata-scsi.c | 38 ++- drivers/ata/libata-sff.c | 20 +- drivers/ata/libata.h | 6 +- drivers/ata/pata_acpi.c | 67 +--- drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_amd.c | 128 +++++-- drivers/ata/pata_bf54x.c | 41 ++- drivers/ata/pata_cs5520.c | 2 +- drivers/ata/pata_hpt37x.c | 7 +- drivers/ata/pata_icside.c | 3 +- drivers/ata/pata_it821x.c | 35 ++- drivers/ata/pata_ixp4xx_cf.c | 26 +- drivers/ata/pata_legacy.c | 784 +++++++++++++++++++++++++++++-------- drivers/ata/pata_ninja32.c | 214 ++++++++++ drivers/ata/pata_pcmcia.c | 101 +++++- drivers/ata/pata_pdc2027x.c | 2 +- drivers/ata/pata_pdc202xx_old.c | 5 +- drivers/ata/pata_qdi.c | 30 +- drivers/ata/pata_scc.c | 30 +- drivers/ata/pata_via.c | 3 +- drivers/ata/pata_winbond.c | 28 +- drivers/ata/pdc_adma.c | 5 +- drivers/ata/sata_fsl.c | 6 +- drivers/ata/sata_inic162x.c | 2 +- drivers/ata/sata_mv.c | 3 +- drivers/ata/sata_nv.c | 25 +- drivers/ata/sata_promise.c | 98 ++--- drivers/ata/sata_promise.h | 2 +- drivers/ata/sata_qstor.c | 15 +- drivers/ata/sata_sil.c | 10 +- drivers/ata/sata_sil24.c | 30 +-- drivers/ata/sata_sx4.c | 15 +- drivers/scsi/ipr.c | 9 +- drivers/scsi/libsas/sas_ata.c | 14 +- include/linux/ata.h | 110 +++++- include/linux/cdrom.h | 2 + include/linux/libata.h | 181 ++++++---- 45 files changed, 2317 insertions(+), 1178 deletions(-) create mode 100644 drivers/ata/pata_ninja32.c ## # quilt /pub/linux/kernel/people/gregkh/gregkh-2.6/patches/. gregkh-everything ## building file list ... done ./ block-make-genhd-use-the-new-class-iterator-functions.patch class-move-driver-core-specific-parts-to-a-private-structure.patch series driver/ driver/driver-core-add-class-iteration-api.patch driver/ieee1394-use-class-iteration-api.patch driver/power-supply-use-class-iteration-api.patch driver/rtc-use-class-iteration-api.patch driver/scsi-use-class-iteration-api.patch driver/spi-use-class-iteration-api.patch driver/uio-constify-function-pointer-tables.patch pci/ pci/pci-constify-function-pointer-tables.patch usb/ usb/usb-constify-function-pointer-tables.patch usb/usb-fix-memleak-in-ark3116-serial-driver.patch usb/usb-kl5kusb105-don-t-flush-to-logically-disconnected-devices.patch usb/usb-make-sure-usb-serial-drivers-don-t-flush-to-logically-disconnected-devices.patch usb/usb-more-serial-drivers-writing-after-disconnect.patch usb/usb-oti6858-cleanup.patch usb/usb-stop-abuse-of-intfdata-in-cypress_m8.patch sent 138856 bytes received 440 bytes 16387.76 bytes/sec total size is 3707368 speedup is 26.62 gregkh/gkh-version.patch gregkh/sysrq-u-laptop.patch gregkh/sysfs-test.patch gregkh/detect-atomic-counter-underflows.patch gregkh/gcc43-workaround.diff driver/chinese-add-the-known_regression-uri-to-the-howto.patch driver/chinese-rephrase-english-introduction-in-howto.patch driver/chinese-change-man-pages-maintainer-address-in-howoto.patch driver/chinese-add-translation-of-submittingpatches.patch driver/chinese-add-translation-of-submittingdrivers.patch driver/chinese-add-translation-of-oops-tracing.txt.patch driver/chinese-add-translation-of-stable_kernel_rules.txt.patch driver/chinese-add-translation-of-volatile-considered-harmful.txt.patch driver/chinese-add-translation-of-sparse.txt.patch driver/chinese-add-translation-of-codingstyle.patch driver/sysfs-fix-a-copy-n-paste-typo-in-comment.patch driver/nozomi.patch driver/documentation-replace-obsolete-driverfs-with-sysfs.patch driver/kobject-remove-incorrect-comment-in-kobject_rename.patch driver/pm-acquire-device-locks-on-suspend.patch driver/kref-add-kref_set.patch driver/aoechr-convert-from-class_device-to-device.patch driver/atm-convert-struct-class_device-to-struct-device.patch driver/coda-convert-struct-class_device-to-struct-device.patch driver/dma-convert-from-class_device-to-device-for-dma-engine.patch driver/ide-convert-from-class_device-to-device-for-ide-tape.patch driver/isdn-convert-from-class_device-to-device-for-isdn-capi.patch driver/adb-convert-from-class_device-to-device.patch driver/mcp_ucb1200-convert-from-class_device-to-device.patch driver/mtd-convert-from-class_device-to-device-for-mtd-mtdchar.patch driver/paride-convert-from-class_device-to-device-for-block-paride.patch driver/pktcdvd-convert-from-class_device-to-device-for-block-pktcdvd.patch driver/tifm-convert-from-class_device-to-device-for-ti-flash-media.patch driver/cosa-convert-from-class_device-to-device-for-cosa-sync-driver.patch driver/ecryptfs-sysfs-fixes.patch driver/driver-core-make-the-dev_-family-of-macros-in-device.h-complete.patch driver/sysfs-create-optimal-relative-symlink-targets.patch driver/sysfs-remove-spin_lock_unlocked.patch driver/kobject-convert-ibmasm-to-use-kref-not-kobject.patch driver/kobject-convert-hvc_console-to-use-kref-not-kobject.patch driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch driver/kobject-convert-icom-to-use-kref-not-kobject.patch driver/kobject-fix-up-kobject_set_name-to-use-kvasprintf.patch driver/kobject-make-kobject_cleanup-be-static.patch driver/kobject-add-kobject_init_ng-function.patch driver/kobject-add-kobject_add_ng-function.patch driver/kobject-add-kobject_init_and_add-function.patch driver/remove-struct-kobj_type-from-struct-kset.patch driver/remove-kobj_set_kset_s.patch driver/kset-add-kset_create_and_add-function.patch driver/kobject-add-kobject_create_and_add-function.patch driver/kobject-get-rid-of-kobject_add_dir.patch driver/kobject-get-rid-of-kobject_kset_add_dir.patch driver/kobject-convert-fuse-to-use-kobject_create.patch driver/kobject-convert-securityfs-to-use-kobject_create.patch driver/kobject-convert-debugfs-to-use-kobject_create.patch driver/kobject-convert-configfs-to-use-kobject_create.patch driver/kset-convert-ecryptfs-to-use-kset_create.patch driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch driver/kset-convert-gfs2-to-use-kset_create.patch driver/kset-convert-gfs2-dlm-to-use-kset_create.patch driver/kset-convert-dlm-to-use-kset_create.patch driver/kset-convert-pci-hotplug-to-use-kset_create_and_add.patch driver/kset-remove-decl_subsys_name.patch driver/kset-convert-kernel_subsys-to-use-kset_create.patch driver/kset-convert-drivers-base-bus.c-to-use-kset_create.patch driver/kset-convert-drivers-base-class.c-to-use-kset_create.patch driver/kset-convert-drivers-base-firmware.c-to-use-kset_create.patch driver/kset-convert-sys-devices-to-use-kset_create.patch driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch driver/kset-convert-sys-devices-system-to-use-kset_create.patch driver/kset-convert-slub-to-use-kset_create.patch driver/kset-move-sys-slab-to-sys-kernel-slab.patch driver/kset-convert-sys-module-to-use-kset_create.patch driver/kset-convert-sys-power-to-use-kset_create.patch driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch driver/kobject-kobj_attribute-handling.patch driver/kset-convert-to-kobj_sysfs_ops.patch driver/struct-user_info-sysfs.patch driver/ecryptfs-remove-version_str-file-from-sysfs.patch driver/efivars-make-new_var-and-del_var-binary-sysfs-files.patch driver/kobject-convert-efivars-to-kobj_attr-interface.patch driver/firmware-export-firmware_kset.patch driver/kset-convert-efivars-to-use-kset_create-for-the-efi-subsystem.patch driver/kset-convert-efivars-to-use-kset_create-for-the-vars-sub-subsystem.patch driver/kobject-convert-arm-mach-omap1-pm.c-to-kobj_attr-interface.patch driver/kobject-convert-pseries-power.c-to-kobj_attr-interface.patch driver/kobject-convert-s390-ipl.c-to-kobj_attr-interface.patch driver/kset-convert-s390-ipl.c-to-use-kset_create.patch driver/kobject-convert-parisc-pdc_stable-to-kobj_attr-interface.patch driver/kset-convert-parisc-pdc_stable.c-to-use-kset_create.patch driver/kset-kill-subsys-attr.patch driver/kset-convert-edd-to-use-kset_create.patch driver/kobject-convert-sys-firmware-acpi-to-use-kobject_create.patch driver/firmware-remove-firmware_register.patch driver/firmware-change-firmware_kset-to-firmware_kobj.patch driver/kset-convert-ocfs2-to-use-kset_create.patch driver/kset-convert-block_subsys-to-use-kset_create.patch driver/kset-remove-decl_subsys-macro.patch driver/kobject-convert-kernel_kset-to-be-a-kobject.patch driver/kobject-remove-subsystem_register-functions.patch driver/kobject-clean-up-rpadlpar-horrid-sysfs-abuse.patch driver/kobject-convert-ecryptfs-to-use-kobject_create.patch driver/kobject-convert-efivars-to-use-kobject_create.patch driver/kobject-convert-parisc-pdc_stable-to-use-kobject_create.patch driver/driver-core-clean-up-shutdown.c.patch driver/driver-core-clean-up-device_shutdown.patch driver/driver-core-make-sys-power-a-kobject.patch driver/kobject-grab-the-kset-reference-in-kobject_add-not-kobject_init.patch driver/kobject-clean-up-debugging-messages.patch driver/uio-fix-kobject-usage.patch driver/kobject-change-net-bridge-to-use-kobject_create_and_add.patch driver/kobject-change-gfs2-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-infiniband-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-firmware-edd.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-firmware-efivars.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-cpufreq-cpufreq.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-edac-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-cpuidle-sysfs.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-pci-hotplug-pci_hotplug_core.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-base-sys.c-to-use-kobject_init_and_add.patch driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-acpi-system.c-to-use-kobject_create_and_add.patch driver/kobject-change-drivers-block-pktcdvd.c-to-use-kobject_init_and_add.patch driver/kobject-change-arch-sh-kernel-cpu-sh4-sq.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-net-ibmveth.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-parisc-pdc_stable.c-to-use-kobject_init_and_add.patch driver/kobject-change-arch-ia64-kernel-topology.c-to-use-kobject_init_and_add.patch driver/kobject-change-drivers-md-md.c-to-use-kobject_init_and_add.patch driver/kobject-change-arch-x86-kernel-cpu-mcheck-mce_amd_64.c-to-use-kobject_create_and_add.patch driver/kobject-change-arch-x86-kernel-cpu-mcheck-mce_amd_64.c-to-use-kobject_init_and_add.patch driver/kobject-the-cris-iop_fw_load.c-code-is-broken.patch driver/kobject-convert-drivers-base-class.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-drivers-base-core.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-drivers-net-iseries_veth.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-fs-char_dev.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-kernel-params.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-kernel-user.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-mm-slub.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-net-bridge-br_if.c-to-use-kobject_init-add_ng.patch driver/driver-core-remove-owner-field-from-struct-bus_type.patch driver/driver-core-add-way-to-get-to-bus-kset.patch driver/driver-core-add-way-to-get-to-bus-device-klist.patch driver/driver-core-remove-fields-from-struct-bus_type.patch driver/usb-use-proper-call-to-driver_create_file.patch driver/pcmcia-use-proper-call-to-driver_create_file.patch driver/pci-use-proper-call-to-driver_create_file.patch driver/pci-remove-foolish-code-from-pci-driver.c.patch driver/driver-core-introduce-default-attribute-groups.patch driver/netiucv-use-device_driver-default-attribute-groups.patch driver/zfcp-use-device_driver-default-attribute-groups.patch driver/infiniband-make-ipath-driver-use-default-driver-groups.patch driver/driver-add-driver_add_kobj-for-looney-iseries_veth-driver.patch driver/driver-core-move-the-driver-specific-module-code-into-the-driver-core.patch driver/driver-core-move-the-static-kobject-out-of-struct-driver.patch driver/driver-core-clean-up-debugging-messages.patch driver/kobject-change-drivers-base-bus-to-use-kobject_init_and_add.patch driver/driver-core-fix-race-in-__device_release_driver.patch driver/driver-core-fix-class-glue-dir-cleanup-logic.patch driver/sysfs-fix-sys-module-holders-after-sysfs-logic-change.patch driver/kobject-drop-child-parent-ref-at-unregistration.patch driver/block-device.patch driver/kobject-convert-block-elevator.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-block-ll_rw_blk.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-drivers-md-md.c-to-use-kobject_init-add_ng.patch driver/kobject-convert-kernel-module.c-to-use-kobject_init-add_ng.patch driver/kobject-remove-kobject_add-as-no-one-uses-it-anymore.patch driver/kobject-rename-kobject_add_ng-to-kobject_add.patch driver/kobject-remove-kobject_init-as-no-one-uses-it-anymore.patch driver/kobject-rename-kobject_init_ng-to-kobject_init.patch driver/kobject-remove-kobject_register.patch driver/kset-remove-kset_add-function.patch driver/kobject-auto-cleanup-on-final-unref.patch driver/modules-remove-unneeded-release-function.patch driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch driver/kobject-convert-drivers-from-kobject_unregister-to-kobject_put.patch driver/kobject-convert-fs-from-kobject_unregister-to-kobject_put.patch driver/kobject-convert-remaining-kobject_unregister-to-kobject_put.patch driver/kobject-remove-kobject_unregister-as-no-one-uses-it-anymore.patch driver/driver-core-change-sysdev-classes-to-use-dynamic-kobject-names.patch driver/kobject-remove-old-outdated-documentation.patch driver/kobject-update-the-kobject-kset-documentation.patch driver/kobject-add-sample-code-for-how-to-use-kobjects-in-a-simple-manner.patch driver/kobject-add-sample-code-for-how-to-use-ksets-ktypes-kobjects.patch driver/driver-core-use-list_head-instead-of-call-to-init_list_head-in-__init.patch driver/sysfs-make-sysfs_deprecated-depend-on-sysfs.patch driver/driver-core-fix-build-with-sysfs-n.patch driver/driver-core-constify-the-name-passed-to-platform_device_register_simple.patch driver/uio-constify-function-pointer-tables.patch driver/driver-core-add-class-iteration-api.patch driver/ieee1394-use-class-iteration-api.patch driver/power-supply-use-class-iteration-api.patch driver/rtc-use-class-iteration-api.patch driver/scsi-use-class-iteration-api.patch driver/spi-use-class-iteration-api.patch driver/put_device-might_sleep.patch driver/warn-when-statically-allocated-kobjects-are-used.patch driver/sysfs-crash-debugging.patch pci/pci-make-pci_restore_bars-static.patch pci/pci-drivers-pci-rom.c-if-0-two-functions.patch pci/pci-drivers-pci-remove-unused-exports.patch pci/pcie-port-driver-correctly-detect-native-pme-feature.patch pci/pcie-utilize-pcie-transaction-pending-bit.patch pci/pci-hotplug-switch-to-pci_get_bus_and_slot.patch pci/pci-hotplug-remove-experimental.patch pci/pci-hotplug-acpiphp-remove-unused-variable-from-acpiphp.patch pci/pci-hotplug-pci_hotplug_core-whitespace-fix.patch pci/pci-hotplug-link-fakephp-last.patch pci/pci-quirk_vialatency-omit-reading-pci-revision-id.patch pci/pci-via-cx700-quirk-to-disable-pci-bus-parking.patch pci/pci-mem-policy-fix-mempolicy-usage-in-pci-driver.patch pci/pci-get-rid-of-pci_dev-vendor-device-_compatible-fields.patch pci/pci-remove-unneeded-lock_kernel-in-drivers-pci-syscall.c.patch pci/pci-always-export-pci_scan_single_device.patch pci/pci-remove-additional-pci_scan_child_bus-prototype.patch pci/pci-drivers-pci-quirks.c-coding-style-cleanup.patch pci/pci-more-sanity-checks-for-dmar.patch pci/pci-unhide-the-smbus-on-the-hp-xw4100.patch pci/pci-hotplug-fix-rpaphp-directory-naming.patch pci/pci-export-pci_restore_msi_state.patch pci/pci-add-missing-space-in-printk-messages.patch pci/pcie-fix-pcie-hotplug-so-that-it-works-with-expresscard-slots-on-dell-notebooks-in-conjunction-with-modparam-of-pciehp_force-1.patch pci/pci-more-fixes-for-pcie-hotplug-so-that-it-works-with-expresscard-slots-on-dell-notebooks-in-conjunction-with-modparam-of-pciehp_force-1.patch pci/pcie-make-use-of-the-previously-split-out-pcie_init_enable_events-function.patch pci/pcie-fix-double-initialization-bug.patch pci/pci-hotplug-acpiphp-fix-trivial-typos.patch pci/pci-hotplug-acpiphp-remove-unneeded-acpi_get_name-function-call.patch pci/pci-hotplug-pciehp-remove-needless-members-from-struct-controller.patch pci/pci-hotplug-pciehp-remove-needless-hp_slot-calculation.patch pci/pci-hotplug-pciehp-use-generic-function-to-find-ext-capability.patch pci/pci-hotplug-pciehp-fix-some-whitespace-damage.patch pci/pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources.patch pci/pci-fix-warning-in-setup-res.c-on-32-bit-platforms-with-64-bit-resources.patch pci/pci-remove-default-pci-expansion-rom-memory-allocation.patch pci/pci-quirk-enable-msi-mapping-on-ht1000.patch pci/pci-drivers-pci-msi.c-move-arch-hooks-to-the-top.patch pci/pci-kconfig-help-don-t-refer-to-the-pci-howto.patch pci/pci-spelling-fixes.patch pci/pci-fix-for-quirk_e100_interrupt.patch pci/pci-print-quirk-name-in-debug-messages.patch pci/pci-use-dev_printk-in-quirk-messages.patch pci/pci-use-dev_printk-in-x86-quirk-messages.patch pci/pci-fix-typo-in-pci_save_pcix_state.patch pci/pci-correctly-initialize-a-structure-for-pcie_save_pcix_state.patch pci/pci-avoid-save-the-same-type-of-cap-multiple-times.patch pci/pci-add-pci_enable_device_-io-mem-intefaces.patch pci/pci-remove-users-of-pci_enable_device_bars.patch pci/pci-remove-pci_enable_device_bars.patch pci/pci-remove-pci_enable_device_bars-from-documentation.patch pci/pciehp-wait-for-1000ms-before-led-operation-after-power-off.patch pci/pciehp-workaround-against-bad-dllp-during-power-off.patch pci/pciehp-block-new-requests-from-the-device-before-power-off.patch pci/pci-convert-drivers-pci-proc.c-to-use-unlocked_ioctl.patch pci/pci-constify-function-pointer-tables.patch pci/pci-make-pci-extended-config-space-a-driver-opt-in.patch pci/pci_bridge-device.patch usb/usb-keyspan-fix-oops.patch usb/usb-gadget-fix-fsl_usb2_udc-potential-oops.patch usb/usb-cp2101-new-device-ids.patch usb/usb-add-support-for-4348-5523-winchiphead-usb-rs-232-adapter.patch usb/usb-sierra-add-support-for-aircard-881u.patch usb/usb-adding-yc-cable-usb-serial-device-to-pl2303.patch usb/usb-sierra-driver-add-devices.patch usb/usb-correct-comments-in-usb-core-notify.c.patch usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch usb/usb-sierra-add-support-for-onda-h600-zte-mf330-datacard-to-usb-driver-for-sierra-wireless.patch usb/usb-remove-duplicate-entry-in-option-driver-and-pl2303-driver-for-huawei-modem.patch usb/usb-pl2303-add-support-for-ratoc-rex-usb60f.patch usb/usb-ftdi-driver-add-support-for-optical-probe-device.patch usb/usb-use-gfp_noio-in-reset-path.patch usb/usb-convert-from-class_device-to-device-for-usb-core.patch usb/usb-remove-unnecessary-zeroing-from-ub.patch usb/usb-autosuspend-for-cdc-acm.patch usb/usb-isd200-don-t-include-linux-ide.h.patch usb/usb-add-iuu_phoenix-driver.patch usb/usb-sis-fb-driver-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels.patch usb/usb-sisusb-_ioctl32_conversion-functions-do-not-exist-in-recent-kernels.patch usb/usb-s3c2410_udc-minor-irq-handler-cleanups.patch usb/usb-usb-mon-mon_bin.c-cleanups.patch usb/usb-device-dma-support-on-omap2.patch usb/usb-ti-3410-5052-usb-serial-convert-td_open_close_lock-to-mutex.patch usb/usb-m66592-udc-add-support-for-sh7722-usbf.patch usb/usb-add-missing-space-to-printk-messages.patch usb/usb-usb-storage-new-lockable-subclass-0x07.patch usb/usb-add-printer-gadget-driver.patch usb/usb-cypress_cy7c63-updated-contact-usage-information.patch usb/usb-usb_serial_console-fix-command-line-parsing.patch usb/usb-usb_serial-clean-tty-reference-in-the-last-close.patch usb/usb-usb_serial_console-allocate-fake-tty-and-termios-before-calling-driver-open-method.patch usb/usb-linux-usb-kbuild-needs-only-header-y-not-unifdef-y.patch usb/usb-drop-unnecessary-continue-in-a-few-drivers.patch usb/usb-make-ksuspend_usbd-thread-non-freezable.patch usb/usb-don-t-change-hc-power-state-for-a-freeze.patch usb/usb-gadget-code-switches-to-pr_err-and-friends.patch usb/usb-prepare-serial-core-for-autosuspend.patch usb/usb-cyberjack-remove-a-unnecessary-variable.patch usb/usb-usb-peripheral-controller-driver-oops-avoidance.patch usb/usb-force-handover-port-to-companion-when-hub_port_connect_change-fails.patch usb/usb-dummy_hcd-don-t-register-drivers-on-the-platform-bus.patch usb/always-announce-new-usb-devices.patch usb/usb-convert-ohci-debug-files-to-use-debugfs-instead-of-sysfs.patch usb/usb-convert-ehci-debug-files-to-use-debugfs-instead-of-sysfs.patch usb/usb-remove-ohci-useless-masking-unmasking-of-wdh-interrupt.patch usb/usb-repair-usbdevfs_connect-ioctl.patch usb/usb-updates-to-usb_reset_composite_device.patch usb/usb-edgeport-usb-serial-converter-convert-es_sem-to-mutex.patch usb/usb-add-usbfs-stubs-for-suspend-and-resume.patch usb/usb-ehci-add-separate-iaa-watchdog-timer.patch usb/usb-dummy_hcd-change-the-default-power-budget.patch usb/usb-pl2303-cleanup-fish-and-soup-macros-in-pl2303-driver.patch usb/usb-pl2303-move-pl2303-vendor-specific-init-to-probe-function.patch usb/usb-pl2303-add-autosuspend-support-to-pl2303-usb-serial-converter.patch usb/usb-belkin_sa-clean-up-for-new-style-termios-and-speed-handling-plus-style.patch usb/usb-keyspan_pda-clean-up-speed-handling.patch usb/usb-mct232-speed-new-termios-and-compliance-cleanups.patch usb/usb-mon-nopage.patch usb/usb-testing-driver-convert-dev-sem-to-mutex.patch usb/usb-testing-driver-don-t-free-a-locked-mutex.patch usb/usb-gadget-pxa2xx_udc-supports-inverted-vbus.patch usb/usb-spelling-fixes.patch usb/usb-ps3-fix-ehci-iso-transfer-bug.patch usb/usb-usb-storage-initializers.c-fix-signedness-difference.patch usb/usb-usbdevfs_urb-__user-annotation.patch usb/usb-ehci-hcd-fix-sparse-warning-about-shadowing-status-symbol.patch usb/usb-add-marvell-orion-usb-host-support.patch usb/usb-ehci-potential-oops-fix-on-arc-tdi-cores.patch usb/usb-gadget-ethernet-error-path-potential-oops-fix.patch usb/usb-fix-null-pointer-dereference-on-drivers-usb-serial-whiteheat.c.patch usb/usb-gadget-at91_udc-minor-fix.patch usb/usb-fix-hcd-kconfig-goofage.patch usb/usb-tosa_udc_use_gpio_vbus.patch.patch usb/usb-mos7720-clean-up-termios.patch usb/usb-ti_usb-termios-cleanups.patch usb/usb-io_ti-clean-up-termios-handling.patch usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch usb/usb-sierra-driver-add-update-dtr-logic.patch usb/usb-export-suspend-statistics.patch usb/usb-add-documentation-for-usb-suspend-statistics.patch usb/usb-ohci-at91-uses-generic-gpio-calls.patch usb/usb-at91_udc-uses-generic-gpio-calls-minor-cleanup.patch usb/usb-pxa2xx_udc-use-debugfs-not-procfs.patch usb/usb-add-ehci-ppc-of-bus-glue.patch usb/usb-misc-legousbtower-semaphore-to-mutex.patch usb/usb-add-ehci-ixp-bus-glue.patch usb/usb-ehci-saves-some-memory-in-iso-transfer-descriptors.patch usb/usb-ehci-minor-iso-updates-always-support-split-iso.patch usb/usb-ehci-completes-high-speed-iso-urbs-sooner.patch usb/usb-usbfs-struct-async-is-a-fixed-size-structure.patch usb/usb-ehci-move-del_timer_sync-calls-outside-spinlocked-region.patch usb/usb-ehci-add-a-short-delay-to-the-bus_suspend-routine.patch usb/usb-usbserial-provide-ezusb-functions-for-an-external-module.patch usb/usb-ftdi_sio-remove-very-old-changelog-entries-from-the-file.patch usb/usb-add-support-for-superh-ohci.patch usb/usb-stop-io-performed-by-mos7720-upon-close.patch usb/usb-constify-function-pointer-tables.patch usb/usb-stop-abuse-of-intfdata-in-cypress_m8.patch usb/usb-fix-memleak-in-ark3116-serial-driver.patch usb/usb-make-sure-usb-serial-drivers-don-t-flush-to-logically-disconnected-devices.patch usb/usb-more-serial-drivers-writing-after-disconnect.patch usb/usb-oti6858-cleanup.patch usb/usb-kl5kusb105-don-t-flush-to-logically-disconnected-devices.patch usb/usb-gotemp.patch foo.patch doesn't exist. Skipping. f1.patch doesn't exist. Skipping. ## # patch -R patches/gregkh-everything/usb/usb-isd200-don-t-include-linux-ide.h.patch gregkh-everything ## Created commit 607ad9b: patch: patches/gregkh-everything/usb/usb-isd200-don-t-include-linux-ide.h.patch 1 files changed, 15 insertions(+), 14 deletions(-) ## # patch -R patches/gregkh-everything/driver/infiniband-make-ipath-driver-use-default-driver-groups.patch gregkh-everything ## Created commit 61a2807: patch: patches/gregkh-everything/driver/infiniband-make-ipath-driver-use-default-driver-groups.patch 4 files changed, 45 insertions(+), 18 deletions(-) ## # merge gregkh-everything ## Auto-merged block/ll_rw_blk.c Auto-merged drivers/ata/pata_cs5520.c Auto-merged drivers/base/attribute_container.c Removed drivers/base/power/shutdown.c Auto-merged drivers/block/nbd.c Auto-merged drivers/block/ub.c Auto-merged drivers/ide/ide-probe.c Auto-merged drivers/ide/ide-tape.c Auto-merged drivers/ide/pci/cs5520.c Auto-merged drivers/ide/setup-pci.c Auto-merged drivers/s390/scsi/zfcp_ccw.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/libsas/sas_scsi_host.c Auto-merged drivers/scsi/lpfc/lpfc_init.c Auto-merged drivers/scsi/qla2xxx/qla_def.h Auto-merged drivers/scsi/qla2xxx/qla_os.c Auto-merged fs/sysfs/file.c Auto-merged include/linux/sched.h Auto-merged include/linux/sysfs.h Auto-merged kernel/params.c Merge made by recursive. Documentation/ABI/testing/sysfs-bus-usb | 33 + .../ABI/testing/sysfs-pci-extended-config | 36 + Documentation/kobject.txt | 489 +++-- Documentation/pci.txt | 37 +- Documentation/pnp.txt | 4 +- Documentation/s390/cds.txt | 2 +- Documentation/usb/gadget_printer.txt | 510 +++++ Documentation/usb/iuu_phoenix.txt | 84 + Documentation/vm/slabinfo.c | 2 +- Documentation/vm/slub.txt | 2 +- Documentation/zh_CN/CodingStyle | 701 +++++++ Documentation/zh_CN/HOWTO | 10 +- Documentation/zh_CN/SubmittingDrivers | 168 ++ Documentation/zh_CN/SubmittingPatches | 416 ++++ Documentation/zh_CN/oops-tracing.txt | 212 +++ Documentation/zh_CN/sparse.txt | 100 + Documentation/zh_CN/stable_kernel_rules.txt | 66 + .../zh_CN/volatile-considered-harmful.txt | 113 ++ arch/alpha/Kconfig | 5 - arch/arm/Kconfig | 5 - arch/arm/kernel/time.c | 4 +- arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-omap1/pm.c | 23 +- arch/arm/mach-pxa/cm-x270.c | 2 +- arch/arm/mach-pxa/lpd270.c | 2 +- arch/arm/mach-pxa/lubbock.c | 2 +- arch/arm/mach-pxa/mainstone.c | 2 +- arch/arm/mach-pxa/tosa.c | 9 +- arch/arm/mach-s3c2410/s3c2410.c | 2 +- arch/arm/mach-s3c2412/s3c2412.c | 2 +- arch/arm/mach-s3c2440/mach-osiris.c | 2 +- arch/arm/mach-s3c2443/s3c2443.c | 2 +- arch/arm/mach-sa1100/irq.c | 2 +- arch/arm/oprofile/common.c | 2 +- arch/arm/plat-omap/gpio.c | 2 +- arch/arm/plat-s3c24xx/dma.c | 2 +- arch/arm/plat-s3c24xx/s3c244x.c | 4 +- arch/avr32/kernel/time.c | 2 +- arch/cris/arch-v32/drivers/iop_fw_load.c | 11 + arch/frv/Kconfig | 5 - arch/ia64/kernel/topology.c | 26 +- arch/m32r/Kconfig | 5 - arch/m68k/Kconfig | 5 - arch/mips/Kconfig | 5 - arch/mips/kernel/i8259.c | 2 +- arch/powerpc/platforms/cell/spu_base.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/pseries/power.c | 32 +- arch/powerpc/sysdev/ipic.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- arch/ppc/syslib/ipic.c | 2 +- arch/ppc/syslib/open_pic.c | 2 +- arch/ppc/syslib/open_pic2.c | 2 +- arch/s390/hypfs/inode.c | 13 +- arch/s390/kernel/ipl.c | 147 +- arch/s390/kernel/time.c | 2 +- arch/sh/drivers/dma/dma-sysfs.c | 2 +- arch/sh/drivers/pci/Kconfig | 5 - arch/sh/kernel/cpu/sh4/sq.c | 13 +- arch/sh/kernel/time.c | 2 +- arch/sh64/Kconfig | 5 - arch/sparc64/Kconfig | 5 - arch/x86/Kconfig | 5 - arch/x86/kernel/apic_32.c | 2 +- arch/x86/kernel/apic_64.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 24 +- arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 30 +- arch/x86/kernel/cpuid.c | 6 +- arch/x86/kernel/i8237.c | 2 +- arch/x86/kernel/i8259_32.c | 2 +- arch/x86/kernel/i8259_64.c | 2 +- arch/x86/kernel/io_apic_32.c | 2 +- arch/x86/kernel/io_apic_64.c | 2 +- arch/x86/kernel/msr.c | 6 +- arch/x86/kernel/nmi_32.c | 2 +- arch/x86/kernel/nmi_64.c | 2 +- arch/x86/kernel/quirks.c | 43 +- arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + arch/x86/oprofile/nmi_int.c | 2 +- arch/x86/pci/common.c | 40 + arch/x86/pci/fixup.c | 22 +- arch/x86/pci/init.c | 10 + arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 2 +- arch/x86/pci/pci.h | 2 + arch/xtensa/Kconfig | 5 - block/elevator.c | 8 +- block/genhd.c | 419 ++--- block/ll_rw_blk.c | 11 +- drivers/Makefile | 2 + drivers/acpi/bus.c | 11 +- drivers/acpi/pci_link.c | 2 +- drivers/acpi/system.c | 13 +- drivers/ata/pata_cs5520.c | 2 +- drivers/base/Makefile | 3 + drivers/base/attribute_container.c | 9 +- drivers/base/base.h | 50 +- drivers/base/bus.c | 219 ++- drivers/base/class.c | 179 ++- drivers/base/core.c | 359 ++-- drivers/base/cpu.c | 2 +- drivers/base/dd.c | 49 +- drivers/base/driver.c | 100 +- drivers/base/firmware.c | 26 +- drivers/base/hypervisor.c | 12 +- drivers/base/init.c | 1 - drivers/base/memory.c | 2 +- drivers/base/module.c | 94 + drivers/base/node.c | 2 +- drivers/base/platform.c | 8 +- drivers/base/power/Makefile | 1 - drivers/base/power/main.c | 502 ++++-- drivers/base/power/power.h | 19 +- drivers/base/power/shutdown.c | 48 - drivers/base/sys.c | 49 +- drivers/block/aoe/aoeblk.c | 51 +- drivers/block/aoe/aoechr.c | 7 +- drivers/block/nbd.c | 15 +- drivers/block/paride/pg.c | 6 +- drivers/block/paride/pt.c | 12 +- drivers/block/pktcdvd.c | 27 +- drivers/block/ub.c | 23 - drivers/char/Kconfig | 10 + drivers/char/Makefile | 1 + drivers/char/hvc_console.c | 80 +- drivers/char/hvcs.c | 78 +- drivers/char/nozomi.c | 1993 ++++++++++++++++++++ drivers/char/sysrq.c | 2 +- drivers/cpufreq/cpufreq.c | 12 +- drivers/cpuidle/sysfs.c | 21 +- drivers/dma/dmaengine.c | 43 +- drivers/edac/edac_device_sysfs.c | 49 +- drivers/edac/edac_mc_sysfs.c | 40 +- drivers/edac/edac_module.c | 2 +- drivers/edac/edac_pci_sysfs.c | 35 +- drivers/firmware/edd.c | 25 +- drivers/firmware/efivars.c | 130 +- drivers/gregkh/Makefile | 1 + drivers/gregkh/gregkh.c | 312 +++ drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/isp1301_omap.c | 6 - drivers/ide/ide-probe.c | 2 +- drivers/ide/ide-tape.c | 14 +- drivers/ide/pci/cs5520.c | 10 +- drivers/ide/setup-pci.c | 6 +- drivers/ieee1394/nodemgr.c | 314 ++-- drivers/infiniband/core/sysfs.c | 39 +- drivers/isdn/capi/capi.c | 6 +- drivers/isdn/gigaset/gigaset.h | 6 - drivers/kvm/kvm_main.c | 2 +- drivers/macintosh/adb.c | 2 +- drivers/macintosh/via-pmu.c | 2 +- drivers/md/dm.c | 4 +- drivers/md/md.c | 31 +- drivers/mfd/ucb1x00-assabet.c | 17 +- drivers/mfd/ucb1x00-core.c | 14 +- drivers/mfd/ucb1x00.h | 4 +- drivers/misc/ibmasm/command.c | 12 +- drivers/misc/ibmasm/ibmasm.h | 10 +- drivers/misc/tifm_7xx1.c | 4 +- drivers/misc/tifm_core.c | 24 +- drivers/mtd/mtdchar.c | 12 +- drivers/net/ibmveth.c | 12 +- drivers/net/iseries_veth.c | 19 +- drivers/net/wan/cosa.c | 5 +- drivers/parisc/pdc_stable.c | 194 +- drivers/pci/access.c | 46 + drivers/pci/bus.c | 18 +- drivers/pci/dmar.c | 20 +- drivers/pci/hotplug/Kconfig | 4 +- drivers/pci/hotplug/Makefile | 4 +- drivers/pci/hotplug/acpiphp.h | 1 - drivers/pci/hotplug/acpiphp_glue.c | 5 +- drivers/pci/hotplug/acpiphp_ibm.c | 4 +- drivers/pci/hotplug/ibmphp_core.c | 11 +- drivers/pci/hotplug/pci_hotplug_core.c | 43 +- drivers/pci/hotplug/pciehp.h | 9 +- drivers/pci/hotplug/pciehp_core.c | 33 +- drivers/pci/hotplug/pciehp_ctrl.c | 27 +- drivers/pci/hotplug/pciehp_hpc.c | 314 ++-- drivers/pci/hotplug/pciehp_pci.c | 43 +- drivers/pci/hotplug/rpadlpar_sysfs.c | 113 +- drivers/pci/hotplug/rpaphp.h | 1 - drivers/pci/hotplug/rpaphp_pci.c | 14 - drivers/pci/hotplug/rpaphp_slot.c | 47 +- drivers/pci/hotplug/shpchp_hpc.c | 2 +- drivers/pci/intel-iommu.c | 2 +- drivers/pci/msi.c | 94 +- drivers/pci/pci-acpi.c | 1 - drivers/pci/pci-driver.c | 63 +- drivers/pci/pci-sysfs.c | 37 +- drivers/pci/pci.c | 117 +- drivers/pci/pci.h | 8 +- drivers/pci/pcie/portdrv_core.c | 5 +- drivers/pci/probe.c | 86 +- drivers/pci/proc.c | 17 +- drivers/pci/quirks.c | 454 +++-- drivers/pci/remove.c | 6 +- drivers/pci/rom.c | 6 +- drivers/pci/setup-bus.c | 64 +- drivers/pci/setup-res.c | 7 +- drivers/pci/syscall.c | 5 - drivers/pcmcia/ds.c | 3 +- drivers/power/apm_power.c | 116 +- drivers/power/power_supply_core.c | 74 +- drivers/rtc/interface.c | 22 +- drivers/s390/net/netiucv.c | 16 +- drivers/s390/scsi/zfcp_ccw.c | 14 +- drivers/s390/scsi/zfcp_ext.h | 3 +- drivers/s390/scsi/zfcp_sysfs_driver.c | 27 +- drivers/scsi/hosts.c | 24 +- drivers/scsi/libsas/sas_scsi_host.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 3 +- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_os.c | 21 +- drivers/serial/icom.c | 24 +- drivers/serial/icom.h | 2 +- drivers/spi/spi.c | 26 +- drivers/uio/uio.c | 95 +- drivers/usb/Kconfig | 5 + drivers/usb/atm/ueagle-atm.c | 6 +- drivers/usb/class/cdc-acm.c | 94 +- drivers/usb/class/cdc-acm.h | 2 + drivers/usb/core/Kconfig | 15 + drivers/usb/core/devio.c | 26 +- drivers/usb/core/driver.c | 8 +- drivers/usb/core/hcd-pci.c | 6 + drivers/usb/core/hcd.c | 14 +- drivers/usb/core/hcd.h | 3 + drivers/usb/core/hub.c | 83 +- drivers/usb/core/notify.c | 2 +- drivers/usb/core/sysfs.c | 46 + drivers/usb/core/usb.c | 4 +- drivers/usb/gadget/Kconfig | 24 + drivers/usb/gadget/Makefile | 3 + drivers/usb/gadget/amd5536udc.c | 3 +- drivers/usb/gadget/at91_udc.c | 87 +- drivers/usb/gadget/at91_udc.h | 17 +- drivers/usb/gadget/atmel_usba_udc.c | 11 +- drivers/usb/gadget/atmel_usba_udc.h | 7 +- drivers/usb/gadget/dummy_hcd.c | 38 +- drivers/usb/gadget/ether.c | 6 +- drivers/usb/gadget/file_storage.c | 14 +- drivers/usb/gadget/fsl_usb2_udc.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.h | 6 +- drivers/usb/gadget/gmidi.c | 6 +- drivers/usb/gadget/goku_udc.c | 1 + drivers/usb/gadget/inode.c | 2 +- drivers/usb/gadget/lh7a40x_udc.c | 1 + drivers/usb/gadget/m66592-udc.c | 104 +- drivers/usb/gadget/m66592-udc.h | 54 + drivers/usb/gadget/net2280.c | 2 +- drivers/usb/gadget/omap_udc.c | 73 +- drivers/usb/gadget/omap_udc.h | 13 +- drivers/usb/gadget/printer.c | 1592 ++++++++++++++++ drivers/usb/gadget/pxa2xx_udc.c | 141 +- drivers/usb/gadget/pxa2xx_udc.h | 25 +- drivers/usb/gadget/rndis.c | 20 +- drivers/usb/gadget/s3c2410_udc.c | 4 +- drivers/usb/gadget/serial.c | 153 +- drivers/usb/gadget/zero.c | 4 +- drivers/usb/host/Kconfig | 22 +- drivers/usb/host/ehci-au1xxx.c | 1 + drivers/usb/host/ehci-dbg.c | 231 ++- drivers/usb/host/ehci-fsl.c | 3 +- drivers/usb/host/ehci-hcd.c | 159 ++- drivers/usb/host/ehci-hub.c | 92 +- drivers/usb/host/ehci-ixp4xx.c | 152 ++ drivers/usb/host/ehci-orion.c | 272 +++ drivers/usb/host/ehci-pci.c | 3 +- drivers/usb/host/ehci-ppc-of.c | 238 +++ drivers/usb/host/ehci-ppc-soc.c | 1 + drivers/usb/host/ehci-ps3.c | 1 + drivers/usb/host/ehci-q.c | 25 +- drivers/usb/host/ehci-sched.c | 136 +- drivers/usb/host/ehci.h | 38 +- drivers/usb/host/isp116x-hcd.c | 1 - drivers/usb/host/ohci-at91.c | 31 + drivers/usb/host/ohci-dbg.c | 213 ++- drivers/usb/host/ohci-hcd.c | 29 +- drivers/usb/host/ohci-sh.c | 143 ++ drivers/usb/host/ohci.h | 7 + drivers/usb/host/pci-quirks.c | 22 +- drivers/usb/host/r8a66597.h | 2 +- drivers/usb/image/mdc800.c | 2 - drivers/usb/misc/Kconfig | 9 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/cypress_cy7c63.c | 7 +- drivers/usb/misc/gotemp.c | 292 +++ drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/legousbtower.c | 30 +- drivers/usb/misc/sisusbvga/sisusb.c | 29 +- drivers/usb/misc/sisusbvga/sisusb.h | 3 - drivers/usb/misc/usbtest.c | 19 +- drivers/usb/mon/mon_bin.c | 22 +- drivers/usb/serial/Kconfig | 26 +- drivers/usb/serial/Makefile | 1 + drivers/usb/serial/airprime.c | 5 +- drivers/usb/serial/ark3116.c | 4 +- drivers/usb/serial/belkin_sa.c | 37 +- drivers/usb/serial/console.c | 90 +- drivers/usb/serial/cp2101.c | 11 +- drivers/usb/serial/cyberjack.c | 1 - drivers/usb/serial/cypress_m8.c | 25 +- drivers/usb/serial/ezusb.c | 4 +- drivers/usb/serial/ftdi_sio.c | 293 +--- drivers/usb/serial/ftdi_sio.h | 15 + drivers/usb/serial/garmin_gps.c | 17 +- drivers/usb/serial/generic.c | 8 + drivers/usb/serial/io_edgeport.c | 8 +- drivers/usb/serial/io_ti.c | 47 +- drivers/usb/serial/iuu_phoenix.c | 1217 ++++++++++++ drivers/usb/serial/iuu_phoenix.h | 122 ++ drivers/usb/serial/keyspan.c | 2 +- drivers/usb/serial/keyspan_pda.c | 38 +- drivers/usb/serial/kl5kusb105.c | 26 +- drivers/usb/serial/mct_u232.c | 43 +- drivers/usb/serial/mct_u232.h | 2 +- drivers/usb/serial/mos7720.c | 61 +- drivers/usb/serial/mos7840.c | 8 +- drivers/usb/serial/option.c | 5 +- drivers/usb/serial/oti6858.c | 129 +- drivers/usb/serial/pl2303.c | 110 +- drivers/usb/serial/pl2303.h | 13 +- drivers/usb/serial/sierra.c | 227 ++-- drivers/usb/serial/ti_usb_3410_5052.c | 58 +- drivers/usb/serial/usb-serial.c | 42 +- drivers/usb/serial/visor.c | 22 +- drivers/usb/serial/whiteheat.c | 10 +- drivers/usb/storage/initializers.c | 3 +- drivers/video/sis/sis.h | 8 - drivers/video/sis/sis_main.c | 48 - fs/block_dev.c | 8 +- fs/char_dev.c | 6 +- fs/coda/psdev.c | 8 +- fs/configfs/mount.c | 13 +- fs/debugfs/inode.c | 13 +- fs/dlm/lockspace.c | 50 +- fs/ecryptfs/main.c | 129 +-- fs/fuse/inode.c | 26 +- fs/gfs2/locking/dlm/sysfs.c | 38 +- fs/gfs2/sys.c | 29 +- fs/namespace.c | 11 +- fs/ocfs2/cluster/masklog.c | 4 +- fs/ocfs2/cluster/sys.c | 83 +- fs/partitions/check.c | 327 ++--- fs/sysfs/dir.c | 2 +- fs/sysfs/file.c | 75 +- fs/sysfs/mount.c | 2 +- fs/sysfs/symlink.c | 88 +- fs/sysfs/sysfs.h | 1 + include/acpi/acpi_bus.h | 2 +- include/asm-arm/arch-at91/board.h | 3 +- include/asm-arm/mach/udc_pxa2xx.h | 2 + include/asm-x86/atomic_32.h | 4 + include/linux/atmdev.h | 4 +- include/linux/device.h | 83 +- include/linux/dmaengine.h | 3 +- include/linux/fs.h | 2 +- include/linux/genhd.h | 37 +- include/linux/init.h | 1 + include/linux/kobject.h | 117 +- include/linux/kref.h | 1 + include/linux/module.h | 19 +- include/linux/pci.h | 70 +- include/linux/pci_hotplug.h | 2 +- include/linux/pktcdvd.h | 2 +- include/linux/platform_device.h | 2 +- include/linux/sched.h | 9 +- include/linux/sysdev.h | 1 + include/linux/sysfs.h | 5 + include/linux/tifm.h | 2 +- include/linux/time.h | 3 +- include/linux/uio_driver.h | 6 +- include/linux/usb.h | 5 +- include/linux/usb/Kbuild | 11 +- include/linux/usb/g_printer.h | 31 + include/linux/usb/gadgetfs.h | 5 + include/linux/usb/serial.h | 3 + include/linux/usb_usual.h | 5 +- include/linux/usbdevice_fs.h | 2 +- include/rdma/ib_verbs.h | 2 +- init/Kconfig | 1 + init/do_mounts.c | 108 +- init/main.c | 9 + kernel/ksysfs.c | 82 +- kernel/module.c | 128 +-- kernel/params.c | 44 +- kernel/power/disk.c | 20 +- kernel/power/main.c | 23 +- kernel/power/power.h | 4 +- kernel/rtmutex-tester.c | 2 +- kernel/time/clocksource.c | 2 +- kernel/time/timekeeping.c | 2 +- kernel/user.c | 107 +- lib/kobject.c | 653 +++++-- lib/kobject_uevent.c | 31 +- lib/kref.c | 15 +- localversion | 1 + mm/slub.c | 23 +- net/atm/atm_sysfs.c | 66 +- net/bridge/br_if.c | 12 +- net/bridge/br_private.h | 2 +- net/bridge/br_sysfs_br.c | 14 +- net/bridge/br_sysfs_if.c | 2 +- samples/Kconfig | 10 + samples/Makefile | 2 +- samples/kobject/Makefile | 1 + samples/kobject/kobject-example.c | 137 ++ samples/kobject/kset-example.c | 278 +++ security/inode.c | 11 +- 414 files changed, 16516 insertions(+), 6123 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-pci-extended-config create mode 100644 Documentation/usb/gadget_printer.txt create mode 100644 Documentation/usb/iuu_phoenix.txt create mode 100644 Documentation/zh_CN/CodingStyle create mode 100644 Documentation/zh_CN/SubmittingDrivers create mode 100644 Documentation/zh_CN/SubmittingPatches create mode 100644 Documentation/zh_CN/oops-tracing.txt create mode 100644 Documentation/zh_CN/sparse.txt create mode 100644 Documentation/zh_CN/stable_kernel_rules.txt create mode 100644 Documentation/zh_CN/volatile-considered-harmful.txt create mode 100644 drivers/base/module.c delete mode 100644 drivers/base/power/shutdown.c create mode 100644 drivers/char/nozomi.c create mode 100644 drivers/gregkh/Makefile create mode 100644 drivers/gregkh/gregkh.c create mode 100644 drivers/usb/gadget/printer.c create mode 100644 drivers/usb/host/ehci-ixp4xx.c create mode 100644 drivers/usb/host/ehci-orion.c create mode 100644 drivers/usb/host/ehci-ppc-of.c create mode 100644 drivers/usb/host/ohci-sh.c create mode 100644 drivers/usb/misc/gotemp.c create mode 100644 drivers/usb/serial/iuu_phoenix.c create mode 100644 drivers/usb/serial/iuu_phoenix.h create mode 100644 include/linux/usb/g_printer.h create mode 100644 localversion create mode 100644 samples/kobject/Makefile create mode 100644 samples/kobject/kobject-example.c create mode 100644 samples/kobject/kset-example.c ## # 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.25 infiniband-for-2.6.25 ## Auto-merged drivers/infiniband/ulp/iser/iscsi_iser.c Auto-merged drivers/infiniband/ulp/iser/iser_initiator.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 - drivers/infiniband/core/cm.c | 294 +++++++++++++++- drivers/infiniband/core/cma.c | 60 ++-- drivers/infiniband/core/fmr_pool.c | 33 ++- drivers/infiniband/core/mad.c | 26 +- drivers/infiniband/core/mad_priv.h | 3 +- drivers/infiniband/core/mad_rmpp.c | 2 +- drivers/infiniband/core/multicast.c | 55 +++- drivers/infiniband/core/smi.h | 18 +- drivers/infiniband/core/ucm.c | 37 +-- drivers/infiniband/core/ucma.c | 92 +++++ drivers/infiniband/core/user_mad.c | 115 +++---- drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +- drivers/infiniband/hw/cxgb3/cxio_wr.h | 5 +- drivers/infiniband/hw/cxgb3/iwch_mem.c | 7 + drivers/infiniband/hw/cxgb3/iwch_provider.c | 5 + drivers/infiniband/hw/cxgb3/iwch_qp.c | 29 +-- drivers/infiniband/hw/ehca/ehca_av.c | 2 +- drivers/infiniband/hw/ehca/ehca_classes.h | 23 ++- drivers/infiniband/hw/ehca/ehca_cq.c | 2 +- drivers/infiniband/hw/ehca/ehca_irq.c | 38 ++- drivers/infiniband/hw/ehca/ehca_iverbs.h | 2 + drivers/infiniband/hw/ehca/ehca_main.c | 15 +- drivers/infiniband/hw/ehca/ehca_qp.c | 180 +++++++++- drivers/infiniband/hw/ehca/ehca_reqs.c | 112 +++++-- drivers/infiniband/hw/ehca/ehca_sqp.c | 6 +- drivers/infiniband/hw/ipath/ipath_common.h | 35 ++- drivers/infiniband/hw/ipath/ipath_cq.c | 2 +- drivers/infiniband/hw/ipath/ipath_debug.h | 4 +- drivers/infiniband/hw/ipath/ipath_driver.c | 180 ++++------ drivers/infiniband/hw/ipath/ipath_eeprom.c | 23 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 94 +++--- drivers/infiniband/hw/ipath/ipath_fs.c | 14 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 395 +++++++++++++++++++--- drivers/infiniband/hw/ipath/ipath_iba6120.c | 439 +++++++++++++++++++----- drivers/infiniband/hw/ipath/ipath_init_chip.c | 67 ++--- drivers/infiniband/hw/ipath/ipath_intr.c | 81 ++--- drivers/infiniband/hw/ipath/ipath_kernel.h | 201 ++++++++--- drivers/infiniband/hw/ipath/ipath_keys.c | 5 +- drivers/infiniband/hw/ipath/ipath_mad.c | 123 ++++--- drivers/infiniband/hw/ipath/ipath_qp.c | 6 +- drivers/infiniband/hw/ipath/ipath_rc.c | 18 +- drivers/infiniband/hw/ipath/ipath_registers.h | 33 +- drivers/infiniband/hw/ipath/ipath_ruc.c | 13 +- drivers/infiniband/hw/ipath/ipath_srq.c | 4 +- drivers/infiniband/hw/ipath/ipath_stats.c | 24 +- drivers/infiniband/hw/ipath/ipath_sysfs.c | 370 ++++++++++++++++++++- drivers/infiniband/hw/ipath/ipath_ud.c | 3 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 55 ++- drivers/infiniband/hw/ipath/ipath_verbs.h | 12 + drivers/infiniband/hw/mlx4/cq.c | 9 +- drivers/infiniband/hw/mthca/mthca_dev.h | 13 +- drivers/infiniband/hw/mthca/mthca_eq.c | 6 +- drivers/infiniband/hw/mthca/mthca_main.c | 40 +-- drivers/infiniband/ulp/ipoib/ipoib.h | 184 ++++++---- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 376 +++++++++++++++------ drivers/infiniband/ulp/ipoib/ipoib_fs.c | 4 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 60 ++-- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 18 +- drivers/infiniband/ulp/iser/Kconfig | 4 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/infiniband/ulp/iser/iser_initiator.c | 2 +- drivers/infiniband/ulp/iser/iser_verbs.c | 8 +- drivers/infiniband/ulp/srp/ib_srp.c | 131 +++++--- drivers/infiniband/ulp/srp/ib_srp.h | 5 + drivers/net/mlx4/fw.c | 2 +- include/net/if_inet6.h | 11 +- include/net/ip.h | 10 +- include/rdma/ib_mad.h | 4 +- include/rdma/rdma_user_cm.h | 13 +- net/ipv4/arp.c | 2 +- net/ipv6/ndisc.c | 2 +- 74 files changed, 3117 insertions(+), 1178 deletions(-) ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git linus acpi-linus ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git test acpi-test ## Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/arm/Kconfig Auto-merged arch/frv/Kconfig Auto-merged arch/mips/Kconfig Auto-merged arch/x86/Kconfig Auto-merged drivers/acpi/bus.c Auto-merged drivers/acpi/pci_link.c Auto-merged drivers/base/power/Makefile Removed drivers/misc/thinkpad_acpi.h Auto-merged drivers/pnp/pnpacpi/rsparser.c Auto-merged kernel/power/disk.c Auto-merged kernel/power/main.c Auto-merged kernel/power/power.h Merge made by recursive. Documentation/00-INDEX | 3 + Documentation/acpi/method-tracing.txt | 26 + Documentation/kernel-parameters.txt | 5 + Documentation/power/basic-pm-debugging.txt | 216 ++- Documentation/power/devices.txt | 49 - Documentation/power/drivers-testing.txt | 30 +- Documentation/power/notifiers.txt | 8 + Documentation/power/userland-swsusp.txt | 82 +- Documentation/thinkpad-acpi.txt | 92 +- arch/arm/Kconfig | 3 + arch/arm/mach-at91/pm.c | 17 +- arch/blackfin/Kconfig | 4 + arch/frv/Kconfig | 5 + arch/ia64/kernel/acpi.c | 32 +- arch/mips/Kconfig | 4 + arch/powerpc/Kconfig | 22 +- arch/powerpc/platforms/52xx/lite5200_pm.c | 10 +- arch/sh/Kconfig | 4 + arch/x86/Kconfig | 6 + arch/x86/kernel/acpi/boot.c | 47 +- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 5 +- arch/x86/kernel/srat_32.c | 2 +- arch/x86/kernel/suspend_64.c | 8 +- drivers/acpi/Kconfig | 12 +- drivers/acpi/bay.c | 10 +- drivers/acpi/blacklist.c | 579 +++++- drivers/acpi/bus.c | 1 - drivers/acpi/debug.c | 57 + drivers/acpi/dock.c | 14 +- drivers/acpi/ec.c | 19 +- drivers/acpi/events/evgpe.c | 25 +- drivers/acpi/glue.c | 4 - drivers/acpi/hardware/hwsleep.c | 79 +- drivers/acpi/numa.c | 3 +- drivers/acpi/osl.c | 214 +- drivers/acpi/pci_bind.c | 4 +- drivers/acpi/pci_irq.c | 2 - drivers/acpi/pci_link.c | 2 +- drivers/acpi/processor_core.c | 17 +- drivers/acpi/processor_perflib.c | 16 +- drivers/acpi/processor_throttling.c | 4 +- drivers/acpi/resources/rsirq.c | 16 +- drivers/acpi/sbs.c | 2 +- drivers/acpi/sbshc.c | 4 +- drivers/acpi/scan.c | 110 +- drivers/acpi/sleep/main.c | 144 +- drivers/acpi/sleep/proc.c | 46 +- drivers/acpi/sleep/sleep.h | 2 - drivers/acpi/tables/Makefile | 2 +- drivers/acpi/tables/tbxfroot.c | 4 +- drivers/acpi/thermal.c | 17 +- drivers/acpi/video.c | 48 +- drivers/base/power/Makefile | 2 +- drivers/firmware/dmi-id.c | 2 - drivers/firmware/dmi_scan.c | 19 + drivers/misc/Kconfig | 19 + drivers/misc/thinkpad_acpi.c | 3098 ++++++++++++++++++--------- drivers/misc/thinkpad_acpi.h | 606 ------ drivers/pnp/pnpacpi/core.c | 2 +- drivers/pnp/pnpacpi/rsparser.c | 25 +- include/acpi/acmacros.h | 6 +- include/acpi/acpi_drivers.h | 2 +- include/acpi/acpi_numa.h | 1 - include/acpi/acpixf.h | 2 + include/acpi/actypes.h | 4 + include/linux/Kbuild | 1 + include/linux/acpi.h | 15 - include/linux/dmi.h | 4 + include/linux/notifier.h | 2 + include/linux/suspend.h | 56 +- include/linux/suspend_ioctls.h | 32 + kernel/power/Kconfig | 65 +- kernel/power/disk.c | 204 ++- kernel/power/main.c | 169 ++- kernel/power/power.h | 90 +- kernel/power/snapshot.c | 31 +- kernel/power/swap.c | 33 +- kernel/power/swsusp.c | 48 +- kernel/power/user.c | 109 +- 79 files changed, 4275 insertions(+), 2509 deletions(-) create mode 100644 Documentation/acpi/method-tracing.txt delete mode 100644 drivers/misc/thinkpad_acpi.h create mode 100644 include/linux/suspend_ioctls.h ## # revert 239665a3bb0a2234980f918913add31bc536cfd1 ## Auto-merged arch/ia64/kernel/acpi.c Auto-merged arch/x86/kernel/acpi/boot.c Auto-merged drivers/acpi/osl.c Auto-merged include/linux/acpi.h Created commit bfd23bb: Revert "ACPI: tables: complete searching upon RSDP w/ bad checksum." 7 files changed, 60 insertions(+), 23 deletions(-) ## # 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 devel arm-devel ## Auto-merged arch/arm/Kconfig Auto-merged arch/arm/mach-omap1/board-fsample.c Auto-merged arch/arm/mach-omap1/board-nokia770.c Auto-merged arch/arm/mach-omap1/board-perseus2.c Auto-merged arch/arm/mach-omap1/pm.c Auto-merged arch/arm/mach-pxa/lpd270.c Auto-merged arch/arm/mach-pxa/lubbock.c Auto-merged arch/arm/mach-pxa/mainstone.c Auto-merged arch/arm/mach-pxa/pxa25x.c Auto-merged arch/arm/mach-pxa/sleep.S Auto-merged arch/arm/plat-omap/mailbox.c Auto-merged arch/arm/vfp/vfp.h Auto-merged drivers/usb/Kconfig Auto-merged drivers/usb/host/ohci-hcd.c Removed include/asm-arm/arch-at91/at91_lcdc.h Merge made by recursive. Documentation/cpu-freq/user-guide.txt | 1 + arch/arm/Kconfig | 56 +- arch/arm/Kconfig.debug | 6 + arch/arm/Makefile | 2 + arch/arm/boot/compressed/head.S | 15 +- arch/arm/common/rtctime.c | 1 - arch/arm/configs/collie_defconfig | 1 - arch/arm/configs/eseries_pxa_defconfig | 1499 +++++++++++++++++++++++++++ arch/arm/configs/iop13xx_defconfig | 156 ++-- arch/arm/configs/iop32x_defconfig | 207 +++-- arch/arm/configs/iop33x_defconfig | 154 ++-- arch/arm/configs/littleton_defconfig | 783 ++++++++++++++ arch/arm/configs/msm_defconfig | 895 ++++++++++++++++ arch/arm/configs/orion_defconfig | 1384 +++++++++++++++++++++++++ arch/arm/configs/pcm027_defconfig | 1096 ++++++++++++++++++++ arch/arm/kernel/dma-isa.c | 2 +- arch/arm/kernel/entry-armv.S | 4 +- arch/arm/kernel/entry-common.S | 2 +- arch/arm/kernel/setup.c | 1 + arch/arm/kernel/smp.c | 34 +- arch/arm/mach-ep93xx/core.c | 258 +++-- arch/arm/mach-integrator/pci_v3.c | 8 +- arch/arm/mach-iop32x/glantank.c | 13 +- arch/arm/mach-ixp23xx/core.c | 1 - arch/arm/mach-ixp23xx/espresso.c | 2 - arch/arm/mach-ixp23xx/ixdp2351.c | 2 - arch/arm/mach-ixp23xx/roadrunner.c | 2 - arch/arm/mach-ixp4xx/Kconfig | 14 + arch/arm/mach-ixp4xx/Makefile | 2 + arch/arm/mach-ixp4xx/ixdp425-setup.c | 29 +- arch/arm/mach-ixp4xx/ixp4xx_npe.c | 741 +++++++++++++ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 274 +++++ arch/arm/mach-ixp4xx/nslu2-power.c | 2 - arch/arm/mach-ks8695/Makefile | 2 +- arch/arm/mach-ks8695/board-micrel.c | 2 +- arch/arm/mach-ks8695/gpio.c | 83 ++ arch/arm/mach-ks8695/pci.c | 326 ++++++ arch/arm/mach-msm/Kconfig | 18 + arch/arm/mach-msm/Makefile | 7 + arch/arm/mach-msm/Makefile.boot | 3 + arch/arm/mach-msm/board-halibut.c | 114 ++ arch/arm/mach-msm/common.c | 116 ++ arch/arm/mach-msm/dma.c | 214 ++++ arch/arm/mach-msm/idle.S | 36 + arch/arm/mach-msm/io.c | 85 ++ arch/arm/mach-msm/irq.c | 154 +++ arch/arm/mach-msm/timer.c | 205 ++++ arch/arm/mach-omap1/board-fsample.c | 2 +- arch/arm/mach-omap1/board-h2.c | 2 +- arch/arm/mach-omap1/board-h3.c | 2 +- arch/arm/mach-omap1/board-innovator.c | 4 +- arch/arm/mach-omap1/board-nokia770.c | 1 - arch/arm/mach-omap1/board-osk.c | 3 +- arch/arm/mach-omap1/board-palmtt.c | 1 - arch/arm/mach-omap1/board-palmz71.c | 1 - arch/arm/mach-omap1/board-perseus2.c | 2 +- arch/arm/mach-omap1/board-voiceblue.c | 2 +- arch/arm/mach-omap1/pm.c | 2 +- arch/arm/mach-omap2/board-2430sdp.c | 2 +- arch/arm/mach-omap2/board-apollon.c | 3 +- arch/arm/mach-orion/Kconfig | 41 + arch/arm/mach-orion/Makefile | 6 + arch/arm/mach-orion/Makefile.boot | 3 + arch/arm/mach-orion/addr-map.c | 484 +++++++++ arch/arm/mach-orion/common.c | 315 ++++++ arch/arm/mach-orion/common.h | 78 ++ arch/arm/mach-orion/db88f5281-setup.c | 364 +++++++ arch/arm/mach-orion/dns323-setup.c | 322 ++++++ arch/arm/mach-orion/gpio.c | 225 ++++ arch/arm/mach-orion/irq.c | 241 +++++ arch/arm/mach-orion/kurobox_pro-setup.c | 234 +++++ arch/arm/mach-orion/pci.c | 557 ++++++++++ arch/arm/mach-orion/rd88f5182-setup.c | 306 ++++++ arch/arm/mach-orion/time.c | 181 ++++ arch/arm/mach-orion/ts209-setup.c | 335 ++++++ arch/arm/mach-pxa/Kconfig | 69 ++ arch/arm/mach-pxa/Makefile | 14 +- arch/arm/mach-pxa/corgi.c | 183 ++++- arch/arm/mach-pxa/corgi_lcd.c | 299 +------ arch/arm/mach-pxa/corgi_ssp.c | 1 + arch/arm/mach-pxa/cpu-pxa.c | 294 ++++++ arch/arm/mach-pxa/devices.c | 662 ++++++++++++ arch/arm/mach-pxa/devices.h | 12 + arch/arm/mach-pxa/eseries.c | 101 ++ arch/arm/mach-pxa/generic.c | 251 +----- arch/arm/mach-pxa/idp.c | 2 +- arch/arm/mach-pxa/littleton.c | 325 ++++++ arch/arm/mach-pxa/lpd270.c | 1 + arch/arm/mach-pxa/lubbock.c | 30 +- arch/arm/mach-pxa/magician.c | 218 ++++ arch/arm/mach-pxa/mainstone.c | 73 ++- arch/arm/mach-pxa/mfp.c | 261 +++--- arch/arm/mach-pxa/pcm027.c | 216 ++++ arch/arm/mach-pxa/pcm990-baseboard.c | 330 ++++++ arch/arm/mach-pxa/pxa25x.c | 20 +- arch/arm/mach-pxa/pxa27x.c | 53 +- arch/arm/mach-pxa/pxa3xx.c | 241 +++++- arch/arm/mach-pxa/sharpsl.h | 19 +- arch/arm/mach-pxa/sleep.S | 9 +- arch/arm/mach-pxa/spitz.c | 106 ++- arch/arm/mach-pxa/ssp.c | 386 ++++++-- arch/arm/mach-pxa/standby.S | 83 ++ arch/arm/mach-pxa/time.c | 82 +-- arch/arm/mach-pxa/zylonite.c | 96 ++- arch/arm/mach-pxa/zylonite_pxa300.c | 65 +- arch/arm/mach-pxa/zylonite_pxa320.c | 45 +- arch/arm/mach-realview/Kconfig | 21 +- arch/arm/mach-realview/Makefile | 3 +- arch/arm/mach-realview/core.c | 179 ++-- arch/arm/mach-realview/core.h | 71 +-- arch/arm/mach-realview/localtimer.c | 141 ++- arch/arm/mach-realview/platsmp.c | 13 +- arch/arm/mach-realview/realview_eb.c | 234 ++++- arch/arm/mach-s3c2410/usb-simtec.c | 2 +- arch/arm/mach-sa1100/ssp.c | 3 +- arch/arm/mach-sa1100/time.c | 38 +- arch/arm/mm/Kconfig | 28 +- arch/arm/mm/Makefile | 1 + arch/arm/mm/proc-feroceon.S | 506 +++++++++ arch/arm/plat-omap/debug-devices.c | 2 +- arch/arm/plat-omap/mailbox.c | 2 +- arch/arm/plat-omap/mcbsp.c | 20 +- arch/arm/tools/mach-types | 239 +++++- arch/arm/vfp/vfp.h | 4 + arch/arm/vfp/vfphw.S | 60 +- arch/arm/vfp/vfpinstr.h | 6 +- arch/arm/vfp/vfpmodule.c | 98 +- arch/powerpc/sysdev/mv64x60_dev.c | 6 - arch/ppc/syslib/mv64x60.c | 1 - drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 32 +- drivers/input/touchscreen/corgi_ts.c | 8 +- drivers/mmc/host/pxamci.c | 61 +- drivers/mmc/host/pxamci.h | 2 +- drivers/net/smc91x.c | 19 +- drivers/net/smc91x.h | 24 +- drivers/pcmcia/pxa2xx_base.c | 1 + drivers/rtc/rtc-sa1100.c | 31 + drivers/serial/21285.c | 2 + drivers/spi/Kconfig | 1 + drivers/spi/pxa2xx_spi.c | 139 +-- drivers/usb/Kconfig | 1 + drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/ohci-pxa27x.c | 13 +- include/asm-arm/arch-at91/at91_lcdc.h | 148 --- include/asm-arm/arch-ep93xx/gpio.h | 58 +- include/asm-arm/arch-ep93xx/irqs.h | 6 - include/asm-arm/arch-ixp4xx/cpu.h | 15 + include/asm-arm/arch-ixp4xx/hardware.h | 6 +- include/asm-arm/arch-ixp4xx/io.h | 16 +- include/asm-arm/arch-ixp4xx/ixp4xx-regs.h | 36 +- include/asm-arm/arch-ixp4xx/npe.h | 39 + include/asm-arm/arch-ixp4xx/platform.h | 24 +- include/asm-arm/arch-ixp4xx/qmgr.h | 126 +++ include/asm-arm/arch-ixp4xx/uncompress.h | 2 +- include/asm-arm/arch-ks8695/regs-gpio.h | 2 + include/asm-arm/arch-msm/board.h | 37 + include/asm-arm/arch-msm/debug-macro.S | 40 + include/asm-arm/arch-msm/dma.h | 151 +++ include/asm-arm/arch-msm/entry-macro.S | 38 + include/asm-arm/arch-msm/hardware.h | 18 + include/asm-arm/arch-msm/io.h | 33 + include/asm-arm/arch-msm/irqs.h | 89 ++ include/asm-arm/arch-msm/memory.h | 27 + include/asm-arm/arch-msm/msm_iomap.h | 104 ++ include/asm-arm/arch-msm/system.h | 23 + include/asm-arm/arch-msm/timex.h | 20 + include/asm-arm/arch-msm/uncompress.h | 36 + include/asm-arm/arch-msm/vmalloc.h | 22 + include/asm-arm/arch-orion/debug-macro.S | 17 + include/asm-arm/arch-orion/dma.h | 1 + include/asm-arm/arch-orion/entry-macro.S | 31 + include/asm-arm/arch-orion/gpio.h | 28 + include/asm-arm/arch-orion/hardware.h | 24 + include/asm-arm/arch-orion/io.h | 27 + include/asm-arm/arch-orion/irqs.h | 61 ++ include/asm-arm/arch-orion/memory.h | 15 + include/asm-arm/arch-orion/orion.h | 143 +++ include/asm-arm/arch-orion/platform.h | 25 + include/asm-arm/arch-orion/system.h | 31 + include/asm-arm/arch-orion/timex.h | 12 + include/asm-arm/arch-orion/uncompress.h | 44 + include/asm-arm/arch-orion/vmalloc.h | 5 + include/asm-arm/arch-pxa/corgi.h | 1 - include/asm-arm/arch-pxa/irqs.h | 10 +- include/asm-arm/arch-pxa/littleton.h | 6 + include/asm-arm/arch-pxa/magician.h | 111 ++ include/asm-arm/arch-pxa/mfp-pxa300.h | 1 + include/asm-arm/arch-pxa/mfp-pxa320.h | 1 + include/asm-arm/arch-pxa/mfp-pxa3xx.h | 252 +++++ include/asm-arm/arch-pxa/mfp.h | 409 ++------ include/asm-arm/arch-pxa/mmc.h | 2 + include/asm-arm/arch-pxa/pcm027.h | 75 ++ include/asm-arm/arch-pxa/pcm990_baseboard.h | 275 +++++ include/asm-arm/arch-pxa/pxa-regs.h | 370 ++------ include/asm-arm/arch-pxa/pxa2xx-regs.h | 84 ++ include/asm-arm/arch-pxa/pxa2xx_spi.h | 24 - include/asm-arm/arch-pxa/pxa3xx-regs.h | 86 ++ include/asm-arm/arch-pxa/regs-ssp.h | 112 ++ include/asm-arm/arch-pxa/sharpsl.h | 2 +- include/asm-arm/arch-pxa/spitz.h | 2 - include/asm-arm/arch-pxa/ssp.h | 36 +- include/asm-arm/arch-pxa/uncompress.h | 14 +- include/asm-arm/arch-pxa/zylonite.h | 9 + include/asm-arm/arch-realview/board-eb.h | 171 +++ include/asm-arm/arch-realview/entry-macro.S | 4 +- include/asm-arm/arch-realview/hardware.h | 1 - include/asm-arm/arch-realview/irqs.h | 105 +-- include/asm-arm/arch-realview/platform.h | 170 +--- include/asm-arm/arch-realview/scu.h | 4 +- include/asm-arm/arch-realview/uncompress.h | 2 + include/asm-arm/cacheflush.h | 8 + include/asm-arm/fpstate.h | 9 +- include/asm-arm/hardware/arm_twd.h | 7 +- include/asm-arm/proc-fns.h | 8 + include/asm-arm/smp.h | 16 + include/asm-arm/vfp.h | 34 +- include/asm-arm/vfpmacros.h | 18 +- include/linux/mv643xx.h | 10 +- include/linux/mv643xx_i2c.h | 22 + sound/oss/waveartist.c | 2 +- 221 files changed, 20338 insertions(+), 3009 deletions(-) create mode 100644 arch/arm/configs/eseries_pxa_defconfig create mode 100644 arch/arm/configs/littleton_defconfig create mode 100644 arch/arm/configs/msm_defconfig create mode 100644 arch/arm/configs/orion_defconfig create mode 100644 arch/arm/configs/pcm027_defconfig create mode 100644 arch/arm/mach-ixp4xx/ixp4xx_npe.c create mode 100644 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c create mode 100644 arch/arm/mach-ks8695/pci.c create mode 100644 arch/arm/mach-msm/Kconfig create mode 100644 arch/arm/mach-msm/Makefile create mode 100644 arch/arm/mach-msm/Makefile.boot create mode 100644 arch/arm/mach-msm/board-halibut.c create mode 100644 arch/arm/mach-msm/common.c create mode 100644 arch/arm/mach-msm/dma.c create mode 100644 arch/arm/mach-msm/idle.S create mode 100644 arch/arm/mach-msm/io.c create mode 100644 arch/arm/mach-msm/irq.c create mode 100644 arch/arm/mach-msm/timer.c create mode 100644 arch/arm/mach-orion/Kconfig create mode 100644 arch/arm/mach-orion/Makefile create mode 100644 arch/arm/mach-orion/Makefile.boot create mode 100644 arch/arm/mach-orion/addr-map.c create mode 100644 arch/arm/mach-orion/common.c create mode 100644 arch/arm/mach-orion/common.h create mode 100644 arch/arm/mach-orion/db88f5281-setup.c create mode 100644 arch/arm/mach-orion/dns323-setup.c create mode 100644 arch/arm/mach-orion/gpio.c create mode 100644 arch/arm/mach-orion/irq.c create mode 100644 arch/arm/mach-orion/kurobox_pro-setup.c create mode 100644 arch/arm/mach-orion/pci.c create mode 100644 arch/arm/mach-orion/rd88f5182-setup.c create mode 100644 arch/arm/mach-orion/time.c create mode 100644 arch/arm/mach-orion/ts209-setup.c create mode 100644 arch/arm/mach-pxa/cpu-pxa.c create mode 100644 arch/arm/mach-pxa/devices.c create mode 100644 arch/arm/mach-pxa/eseries.c create mode 100644 arch/arm/mach-pxa/littleton.c create mode 100644 arch/arm/mach-pxa/magician.c create mode 100644 arch/arm/mach-pxa/pcm027.c create mode 100644 arch/arm/mach-pxa/pcm990-baseboard.c create mode 100644 arch/arm/mm/proc-feroceon.S delete mode 100644 include/asm-arm/arch-at91/at91_lcdc.h create mode 100644 include/asm-arm/arch-ixp4xx/npe.h create mode 100644 include/asm-arm/arch-ixp4xx/qmgr.h create mode 100644 include/asm-arm/arch-msm/board.h create mode 100644 include/asm-arm/arch-msm/debug-macro.S create mode 100644 include/asm-arm/arch-msm/dma.h create mode 100644 include/asm-arm/arch-msm/entry-macro.S create mode 100644 include/asm-arm/arch-msm/hardware.h create mode 100644 include/asm-arm/arch-msm/io.h create mode 100644 include/asm-arm/arch-msm/irqs.h create mode 100644 include/asm-arm/arch-msm/memory.h create mode 100644 include/asm-arm/arch-msm/msm_iomap.h create mode 100644 include/asm-arm/arch-msm/system.h create mode 100644 include/asm-arm/arch-msm/timex.h create mode 100644 include/asm-arm/arch-msm/uncompress.h create mode 100644 include/asm-arm/arch-msm/vmalloc.h create mode 100644 include/asm-arm/arch-orion/debug-macro.S create mode 100644 include/asm-arm/arch-orion/dma.h create mode 100644 include/asm-arm/arch-orion/entry-macro.S create mode 100644 include/asm-arm/arch-orion/gpio.h create mode 100644 include/asm-arm/arch-orion/hardware.h create mode 100644 include/asm-arm/arch-orion/io.h create mode 100644 include/asm-arm/arch-orion/irqs.h create mode 100644 include/asm-arm/arch-orion/memory.h create mode 100644 include/asm-arm/arch-orion/orion.h create mode 100644 include/asm-arm/arch-orion/platform.h create mode 100644 include/asm-arm/arch-orion/system.h create mode 100644 include/asm-arm/arch-orion/timex.h create mode 100644 include/asm-arm/arch-orion/uncompress.h create mode 100644 include/asm-arm/arch-orion/vmalloc.h create mode 100644 include/asm-arm/arch-pxa/littleton.h create mode 100644 include/asm-arm/arch-pxa/magician.h create mode 100644 include/asm-arm/arch-pxa/mfp-pxa3xx.h create mode 100644 include/asm-arm/arch-pxa/pcm027.h create mode 100644 include/asm-arm/arch-pxa/pcm990_baseboard.h create mode 100644 include/asm-arm/arch-pxa/pxa2xx-regs.h create mode 100644 include/asm-arm/arch-pxa/regs-ssp.h create mode 100644 include/asm-arm/arch-realview/board-eb.h create mode 100644 include/linux/mv643xx_i2c.h ## # 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 ## Auto-merged MAINTAINERS Auto-merged drivers/firewire/fw-sbp2.c Auto-merged drivers/ieee1394/sbp2.c Merge made by recursive. MAINTAINERS | 4 +- drivers/firewire/fw-ohci.c | 390 ++++++++++++++++++------------ drivers/firewire/fw-sbp2.c | 93 +++++--- drivers/firewire/fw-transaction.c | 2 +- drivers/ieee1394/dma.c | 39 +-- drivers/ieee1394/ieee1394_transactions.c | 68 ----- drivers/ieee1394/ohci1394.c | 12 +- drivers/ieee1394/raw1394.c | 4 +- drivers/ieee1394/sbp2.c | 52 ++-- drivers/ieee1394/sbp2.h | 1 - 10 files changed, 346 insertions(+), 319 deletions(-) ## # git git://lost.foo-projects.org/~dwillia2/git/iop md-for-linus iop ## Auto-merged MAINTAINERS Auto-merged drivers/dma/dmaengine.c Auto-merged include/linux/dmaengine.h Merge made by recursive. MAINTAINERS | 7 + crypto/async_tx/async_memcpy.c | 38 +- crypto/async_tx/async_memset.c | 28 +- crypto/async_tx/async_tx.c | 9 +- crypto/async_tx/async_xor.c | 120 +++-- drivers/dma/Kconfig | 20 +- drivers/dma/Makefile | 1 + drivers/dma/dmaengine.c | 49 +- drivers/dma/fsldma.c | 1068 ++++++++++++++++++++++++++++++++ drivers/dma/fsldma.h | 189 ++++++ drivers/dma/ioat_dma.c | 43 +- drivers/dma/iop-adma.c | 138 ++--- include/asm-arm/arch-iop13xx/adma.h | 18 +- include/asm-arm/hardware/iop3xx-adma.h | 30 +- include/linux/async_tx.h | 13 +- include/linux/dmaengine.h | 29 +- 16 files changed, 1538 insertions(+), 262 deletions(-) create mode 100644 drivers/dma/fsldma.c create mode 100644 drivers/dma/fsldma.h ## # skip git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git mm x86 ## SKIPPING: skip git /pub/scm/linux/kernel/git/x86/linux-2.6-x86.git mm x86 ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git release ia64-release ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/aegl/linux-2.6.git test ia64-test ## Already up-to-date. ## # git /pub/scm/linux/kernel/git/jejb/scsi-bidi-2.6.git master scsi-post-merge ## Auto-merged drivers/scsi/aacraid/linit.c Auto-merged drivers/scsi/hosts.c Auto-merged drivers/scsi/qla2xxx/qla_os.c Auto-merged drivers/scsi/sd.c Merge made by recursive. arch/ia64/hp/sim/simscsi.c | 1 - drivers/scsi/3w-9xxx.c | 1 - drivers/scsi/3w-xxxx.c | 1 - drivers/scsi/BusLogic.c | 1 - drivers/scsi/NCR53c406a.c | 1 - drivers/scsi/a100u2w.c | 1 - drivers/scsi/aacraid/linit.c | 1 - drivers/scsi/aha1740.c | 1 - drivers/scsi/aic7xxx/aic79xx_osm.c | 1 - drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 - drivers/scsi/aic7xxx_old.c | 1 - drivers/scsi/arcmsr/arcmsr_hba.c | 1 - drivers/scsi/dc395x.c | 1 - drivers/scsi/dpt_i2o.c | 1 - drivers/scsi/eata.c | 1 - drivers/scsi/hosts.c | 1 - drivers/scsi/hptiop.c | 1 - drivers/scsi/ibmmca.c | 1 - drivers/scsi/ibmvscsi/ibmvscsi.c | 1 - drivers/scsi/initio.c | 1 - drivers/scsi/iscsi_tcp.c | 1 - drivers/scsi/libsrp.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 2 - drivers/scsi/mac53c94.c | 1 - drivers/scsi/megaraid.c | 1 - drivers/scsi/megaraid/megaraid_mbox.c | 1 - drivers/scsi/megaraid/megaraid_sas.c | 1 - drivers/scsi/mesh.c | 1 - drivers/scsi/nsp32.c | 1 - drivers/scsi/pcmcia/sym53c500_cs.c | 1 - drivers/scsi/qla1280.c | 1 - drivers/scsi/qla2xxx/qla_os.c | 2 - drivers/scsi/qla4xxx/ql4_os.c | 1 - drivers/scsi/qlogicfas.c | 1 - drivers/scsi/scsi.c | 2 +- drivers/scsi/scsi_error.c | 33 ++--- drivers/scsi/scsi_lib.c | 257 +++++++++++++++++++-------------- drivers/scsi/scsi_tgt_lib.c | 28 +--- drivers/scsi/sd.c | 4 +- drivers/scsi/sr.c | 25 ++-- drivers/scsi/stex.c | 1 - drivers/scsi/sym53c416.c | 1 - drivers/scsi/sym53c8xx_2/sym_glue.c | 1 - drivers/scsi/u14-34f.c | 1 - drivers/scsi/ultrastor.c | 1 - drivers/scsi/wd7000.c | 1 - drivers/usb/storage/isd200.c | 8 +- include/linux/scatterlist.h | 5 +- include/scsi/scsi.h | 19 +++ include/scsi/scsi_cmnd.h | 59 ++++++--- include/scsi/scsi_eh.h | 9 +- include/scsi/scsi_host.h | 17 +-- lib/scatterlist.c | 41 ++++-- 53 files changed, 283 insertions(+), 269 deletions(-) ## # check ## Differences exist, continuing ## # label ## Created commit 97f7f74: 2.6.24-rc8-mc9 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- ##