summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2009-02-11Merge branch 'quilt/staging'Stephen Rothwell
2009-02-11Merge commit 'kmemleak/kmemleak'Stephen Rothwell
Conflicts: include/linux/slab.h init/main.c lib/Kconfig.debug mm/slab.c mm/slob.c mm/slub.c
2009-02-11Merge commit 'audit/for-next'Stephen Rothwell
2009-02-11Merge commit 'trivial/for-next'Stephen Rothwell
2009-02-11Merge commit 'proc/proc'Stephen Rothwell
Conflicts: security/selinux/hooks.c
2009-02-11Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/dma-mapping.h
2009-02-11Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
Conflicts: kernel/irq/handle.c
2009-02-11Merge commit 'security-testing/next'Stephen Rothwell
2009-02-11Merge commit 'voltage/for-next'Stephen Rothwell
2009-02-11Merge commit 'mfd/for-next'Stephen Rothwell
2009-02-11Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS mm/Makefile
2009-02-11Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: include/linux/slub_def.h mm/slob.c mm/slub.c
2009-02-11Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-02-11Merge commit 'leds/for-mm'Stephen Rothwell
2009-02-11Merge commit 'battery/master'Stephen Rothwell
2009-02-11Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2009-02-11Merge commit 'gfs2/master'Stephen Rothwell
2009-02-11Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/include/asm/es7000/apic.h arch/x86/include/asm/numaq/apic.h arch/x86/kernel/cpu/cpufreq/powernow-k8.c drivers/net/virtio_net.c
2009-02-11Merge commit 'sound/for-next'Stephen Rothwell
Conflicts: sound/soc/pxa/pxa2xx-i2s.c
2009-02-11Merge commit 'net/master'Stephen Rothwell
2009-02-11Merge commit 'scsi/master'Stephen Rothwell
2009-02-11Merge commit 'kvm/master'Stephen Rothwell
2009-02-11Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-02-11Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2009-02-11Merge commit 'acpi/test'Stephen Rothwell
2009-02-11Merge commit 'nfs/linux-next'Stephen Rothwell
2009-02-11Merge branch 'quilt/ide'Stephen Rothwell
2009-02-11Merge commit 'quota/for_next'Stephen Rothwell
2009-02-11Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-02-11Merge branch 'quilt/i2c'Stephen Rothwell
2009-02-11Merge commit 'hid/for-next'Stephen Rothwell
2009-02-11Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-02-11Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/pcie/portdrv_pci.c
2009-02-11Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-02-11Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-02-11Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2009-02-11Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2009-02-11Merge commit 'tip-core/auto-core-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/setup.h fs/btrfs/locking.c
2009-02-11Merge branch 'quilt/usb'Stephen Rothwell
2009-02-11Merge branch 'quilt/driver-core'Stephen Rothwell
2009-02-11Merge commit 'x86/auto-x86-next'Stephen Rothwell
2009-02-11Merge commit 'sh/master'Stephen Rothwell
2009-02-11Merge commit 'galak/next'Stephen Rothwell
2009-02-11ide: use ata_tf_protocols enumsBartlomiej Zolnierkiewicz
* Add IDE_TFLAG_MULTI_PIO taskfile flag and set it for commands using multi-PIO protocol. * Use ata_tf_protocols enums instead of TASKFILE_* defines to denote command's protocol and then rename ->data_phase field to ->protocol. * Remove no longer needed <linux/hdreg.h> includes. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: move command related fields from ide_hwif_t to struct ide_cmdBartlomiej Zolnierkiewicz
* Move command related fields from ide_hwif_t to struct ide_cmd. * Make ide_init_sg_cmd() take command and sectors number as arguments. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: pass command instead of request to ide_pio_datablock()Bartlomiej Zolnierkiewicz
* Add IDE_TFLAG_FS taskfile flag and set it for REQ_TYPE_FS requests. * Convert ->{in,out}put_data methods to take command instead of request as an argument. Then convert pre_task_out_intr(), task_end_request(), task_error(), task_in_unexpected(), ide_pio_sector(), ide_pio_multi() and ide_pio_datablock() in similar way. * Rename task_end_request() to ide_finish_cmd(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: remove ide_task_t typedefBartlomiej Zolnierkiewicz
While at it: - rename struct ide_task_s to struct ide_cmd - remove stale comments from idedisk_{read_native,set}_max_address() - drop unused 'cmd' argument from ide_{cmd,task}_ioctl() - drop unused 'task' argument from tx4939ide_tf_load_fixup() - rename ide_complete_task() to ide_complete_cmd() - use consistent naming for struct ide_cmd variables There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: call ide_build_sglist() prior to ->dma_setup (v2)Bartlomiej Zolnierkiewicz
* Re-map sg table if needed in ide_build_sglist(). * Move ide_build_sglist() call from ->dma_setup to its users. * Un-export ide_build_sglist(). v2: * Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap). There should be no functional changes caused by this patch. Cc: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: return request status from ->pc_callback methodBartlomiej Zolnierkiewicz
Make ->pc_callback method return request status and then move the request completion from ->pc_callback to ide_pc_intr(). There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2009-02-11ide: remove ->end_request methodBartlomiej Zolnierkiewicz
* Handle completion of private driver requests explicitly for ide_floppy and ide_tape media in ide_kill_rq(). * Remove no longer needed ->end_request method. There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>