The patch titled dma: fix Kconfig text has been added to the -mm tree. Its filename is dmaengine-driver-for-the-avr32-dmaca-controller.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: dma: fix Kconfig text From: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Correct recently changed (and now invalid) Kconfig descriptions for the DMA engine framework: - Non-Intel(R) hardware also has DMA engines; - DMA is used for more than memcpy and RAID offloading. In fact, on most platforms memcpy and RAID aren't factors, and DMA exists so that peripherals can transfer data to/from memory while the CPU does other work. Signed-off-by: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: Shannon Nelson <shannon.nelson@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/dma/Kconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/dma/Kconfig~dmaengine-driver-for-the-avr32-dmaca-controller drivers/dma/Kconfig --- a/drivers/dma/Kconfig~dmaengine-driver-for-the-avr32-dmaca-controller +++ a/drivers/dma/Kconfig @@ -3,11 +3,13 @@ # menuconfig DMADEVICES - bool "DMA Offload Engine support" + bool "DMA Engine support" depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX help - Intel(R) offload engines enable offloading memory copies in the - network stack and RAID operations in the MD driver. + DMA engines can do asynchronous data transfers without + involving the host CPU. Currently, this framework can be + used to offload memory copies in the network stack and + RAID operations in the MD driver. if DMADEVICES _ Patches currently in -mm which might be from hskinnemoen@xxxxxxxxx are atmel_spi-labels-gpios-better.patch dmaengine-driver-for-the-avr32-dmaca-controller.patch git-avr32.patch git-mtd.patch mmc-add-missing-sg_init_table-call.patch read_current_time-cleanups.patch atmel_spi-throughput-improvement.patch atmel_spi-chain-dma-transfers.patch atmel_spi-fix-dmachain-oops-with-debug-enabled.patch generic-gpio-gpio_chip-support.patch avr32-uses-gpio_chip.patch mcp23s08-spi-gpio-expander.patch mcp23s08-spi-gpio-expander-checkpatch-fixes.patch sanitize-the-type-of-struct-useru_ar0.patch add-cmpxchg_local-to-avr32.patch tty-let-architectures-override-the-user-kernel-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html