Merge tag 'dmaengine-fixes-3.13-rc4' of...
Merge tag 'dmaengine-fixes-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine Pull dmaengine fixes from Dan Williams: - deprecation of net_dma to be removed in 3.14 - crash regression fix in pl330 from the dmaengine_unmap rework - crash regression fix for any channel running raid ops without CONFIG_ASYNC_TX_DMA from dmaengine_unmap - memory leak regression in mv_xor from dmaengine_unmap - build warning regressions in mv_xor, fsldma, ppc4xx, txx9, and at_hdmac from dmaengine_unmap - sleep in atomic regression in dma_async_memcpy_pg_to_pg - new fix in mv_xor for handling channel initialization failures * tag 'dmaengine-fixes-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine: net_dma: mark broken dma: pl330: ensure DMA descriptors are zero-initialised dmaengine: fix sleep in atomic dmaengine: mv_xor: fix oops when channels fail to initialise dma: mv_xor: Use dmaengine_unmap_data for the self-tests dmaengine: fix enable for high order unmap pools dma: fix build warnings in txx9 dmatest: fix build warning on mips dma: fix fsldma build warnings dma: fix build warnings in ppc4xx dmaengine: at_hdmac: remove unused function dma: mv_xor: remove mv_desc_get_dest_addr()
Showing
- drivers/dma/Kconfig 7 additions, 0 deletionsdrivers/dma/Kconfig
- drivers/dma/at_hdmac_regs.h 0 additions, 4 deletionsdrivers/dma/at_hdmac_regs.h
- drivers/dma/dmaengine.c 2 additions, 2 deletionsdrivers/dma/dmaengine.c
- drivers/dma/dmatest.c 4 additions, 4 deletionsdrivers/dma/dmatest.c
- drivers/dma/fsldma.c 1 addition, 30 deletionsdrivers/dma/fsldma.c
- drivers/dma/mv_xor.c 63 additions, 38 deletionsdrivers/dma/mv_xor.c
- drivers/dma/pl330.c 1 addition, 4 deletionsdrivers/dma/pl330.c
- drivers/dma/ppc4xx/adma.c 1 addition, 26 deletionsdrivers/dma/ppc4xx/adma.c
- drivers/dma/txx9dmac.c 0 additions, 1 deletiondrivers/dma/txx9dmac.c
Loading
Please register or sign in to comment