Skip to content
  • Linus Torvalds's avatar
    Merge tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine · 26b0332e
    Linus Torvalds authored
    Pull dmaengine update from Dan Williams:
     "Collection of random updates to the core and some end-driver fixups
      for ioatdma and mv_xor:
       - NUMA aware channel allocation
       - Cleanup dmatest debugfs interface
       - ioat: make raid-support Atom only
       - mv_xor: big endian
    
      Aside from the top three commits these have all had some soak time in
      -next.  The top commit fixes a recent build breakage.
    
      It has been a long while since my last pull request, hopefully it does
      not show.  Thanks to Vinod for keeping an eye on drivers/dma/ this
      past year"
    
    * tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
      dmaengine: dma_sync_wait and dma_find_channel undefined
      MAINTAINERS: update email for Dan Williams
      dma: mv_xor: Fix incorrect error path
      ioatdma: silence GCC warnings
      dmaengine: make dma_channel_rebalance() NUMA aware
      dmaengine: make dma_submit_error() return an error code
      ioatdma: disable RAID on non-Atom platforms and reenable unaligned copies
      mv_xor: support big endian systems using descriptor swap feature
      mv_xor: use {readl, writel}_relaxed instead of __raw_{readl, writel}
      dmatest: print message on debug level in case of no error
      dmatest: remove IS_ERR_OR_NULL checks of debugfs calls
      dmatest: make module parameters writable
    26b0332e