Merge branch 'dmaengine' into async-tx-next

Conflicts: crypto/async_tx/async_xor.c drivers/dma/ioat/dma_v2.h drivers/dma/ioat/pci.c drivers/md/raid5.c
2026-10-16 22:39:48 +00:00 · 2009-09-08 17:55:21 -07:00 · 2009-09-08 17:55:21 -07:00 · bbb20089a3
commit bbb20089a3
parent 3e48e65690 657a77fa72
7878 changed files with 861583 additions and 480202 deletions
--- a/include/Kbuild
+++ b/include/Kbuild
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.h
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
--- a/include/asm-generic/atomic64.h
+++ b/include/asm-generic/atomic64.h
--- a/include/asm-generic/auxvec.h
+++ b/include/asm-generic/auxvec.h
--- a/include/asm-generic/bitops.h
+++ b/include/asm-generic/bitops.h
--- a/include/asm-generic/bitops/atomic.h
+++ b/include/asm-generic/bitops/atomic.h
--- a/include/asm-generic/bitsperlong.h
+++ b/include/asm-generic/bitsperlong.h
--- a/include/asm-generic/bugs.h
+++ b/include/asm-generic/bugs.h
--- a/include/asm-generic/cache.h
+++ b/include/asm-generic/cache.h
--- a/include/asm-generic/cacheflush.h
+++ b/include/asm-generic/cacheflush.h
--- a/include/asm-generic/checksum.h
+++ b/include/asm-generic/checksum.h
--- a/include/asm-generic/current.h
+++ b/include/asm-generic/current.h
--- a/include/asm-generic/delay.h
+++ b/include/asm-generic/delay.h
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
--- a/include/asm-generic/dma.h
+++ b/include/asm-generic/dma.h
--- a/include/asm-generic/errno.h
+++ b/include/asm-generic/errno.h
--- a/include/asm-generic/fb.h
+++ b/include/asm-generic/fb.h
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
--- a/include/asm-generic/hardirq.h
+++ b/include/asm-generic/hardirq.h
--- a/include/asm-generic/hw_irq.h
+++ b/include/asm-generic/hw_irq.h
--- a/include/asm-generic/int-l64.h
+++ b/include/asm-generic/int-l64.h
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
--- a/include/asm-generic/ipcbuf.h
+++ b/include/asm-generic/ipcbuf.h
--- a/include/asm-generic/irq.h
+++ b/include/asm-generic/irq.h
--- a/include/asm-generic/irqflags.h
+++ b/include/asm-generic/irqflags.h
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
--- a/include/asm-generic/linkage.h
+++ b/include/asm-generic/linkage.h
--- a/include/asm-generic/mman-common.h
+++ b/include/asm-generic/mman-common.h
--- a/include/asm-generic/mman.h
+++ b/include/asm-generic/mman.h
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
--- a/include/asm-generic/mmu_context.h
+++ b/include/asm-generic/mmu_context.h
--- a/include/asm-generic/module.h
+++ b/include/asm-generic/module.h
--- a/include/asm-generic/msgbuf.h
+++ b/include/asm-generic/msgbuf.h
--- a/include/asm-generic/mutex.h
+++ b/include/asm-generic/mutex.h
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
--- a/include/asm-generic/param.h
+++ b/include/asm-generic/param.h
--- a/include/asm-generic/parport.h
+++ b/include/asm-generic/parport.h
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
--- a/include/asm-generic/pgalloc.h
+++ b/include/asm-generic/pgalloc.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/posix_types.h
+++ b/include/asm-generic/posix_types.h
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
--- a/include/asm-generic/scatterlist.h
+++ b/include/asm-generic/scatterlist.h
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
--- a/include/asm-generic/segment.h
+++ b/include/asm-generic/segment.h
--- a/include/asm-generic/sembuf.h
+++ b/include/asm-generic/sembuf.h
--- a/include/asm-generic/serial.h
+++ b/include/asm-generic/serial.h
--- a/include/asm-generic/setup.h
+++ b/include/asm-generic/setup.h
--- a/include/asm-generic/shmbuf.h
+++ b/include/asm-generic/shmbuf.h
--- a/include/asm-generic/shmparam.h
+++ b/include/asm-generic/shmparam.h
--- a/include/asm-generic/signal-defs.h
+++ b/include/asm-generic/signal-defs.h
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal.h
--- a/include/asm-generic/socket.h
+++ b/include/asm-generic/socket.h
--- a/include/asm-generic/sockios.h
+++ b/include/asm-generic/sockios.h
--- a/include/asm-generic/spinlock.h
+++ b/include/asm-generic/spinlock.h
--- a/include/asm-generic/stat.h
+++ b/include/asm-generic/stat.h
--- a/include/asm-generic/string.h
+++ b/include/asm-generic/string.h
--- a/include/asm-generic/swab.h
+++ b/include/asm-generic/swab.h
--- a/include/asm-generic/syscalls.h
+++ b/include/asm-generic/syscalls.h
--- a/include/asm-generic/system.h
+++ b/include/asm-generic/system.h
--- a/include/asm-generic/termbits.h
+++ b/include/asm-generic/termbits.h
--- a/include/asm-generic/termios-base.h
+++ b/include/asm-generic/termios-base.h
--- a/include/asm-generic/termios.h
+++ b/include/asm-generic/termios.h
--- a/include/asm-generic/timex.h
+++ b/include/asm-generic/timex.h
--- a/include/asm-generic/tlbflush.h
+++ b/include/asm-generic/tlbflush.h
--- a/include/asm-generic/types.h
+++ b/include/asm-generic/types.h
--- a/include/asm-generic/uaccess-unaligned.h
+++ b/include/asm-generic/uaccess-unaligned.h
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
--- a/include/asm-generic/ucontext.h
+++ b/include/asm-generic/ucontext.h
--- a/include/asm-generic/unaligned.h
+++ b/include/asm-generic/unaligned.h
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
--- a/include/asm-generic/user.h
+++ b/include/asm-generic/user.h
--- a/include/asm-generic/vga.h
+++ b/include/asm-generic/vga.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_hashtab.h
+++ b/include/drm/drm_hashtab.h
--- a/include/drm/drm_memory_debug.h
+++ b/include/drm/drm_memory_debug.h
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/drm/ttm/ttm_memory.h
+++ b/include/drm/ttm/ttm_memory.h
--- a/include/drm/ttm/ttm_module.h
+++ b/include/drm/ttm/ttm_module.h
--- a/include/drm/ttm/ttm_placement.h
+++ b/include/drm/ttm/ttm_placement.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/Show more
+++ b/Show more