• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 6f68fbaa
    Linus Torvalds authored
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      DMAENGINE: extend the control command to include an arg
      async_tx: trim dma_async_tx_descriptor in 'no channel switch' case
      DMAENGINE: DMA40 fix for allocation of logical channel 0
      DMAENGINE: DMA40 support paused channel status
      dmaengine: mpc512x: Use resource_size
      DMA ENGINE: Do not reset 'private' of channel
      ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device
      ioat3: disable cacheline-unaligned transfers for raid operations
      ioat2,3: convert to producer/consumer locking
      ioat: convert to circ_buf
      DMAENGINE: Support for ST-Ericssons DMA40 block v3
      async_tx: use of kzalloc/kfree requires the include of slab.h
      dmaengine: provide helper for setting txstate
      DMAENGINE: generic channel status v2
      DMAENGINE: generic slave control v2
      dma: timb-dma: Update comment and fix compiler warning
      dma: Add timb-dma
      DMAENGINE: COH 901 318 fix bytesleft
      DMAENGINE: COH 901 318 rename confusing vars
    6f68fbaa
sh-sci.c 47.6 KB