diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 09:58:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-07 09:58:34 -0800 |
| commit | c431b42058ecad834d87fea002604dc38feccfd2 (patch) | |
| tree | 4532077e1a47525c49e295f8aec71865339dc5f8 /arch/mips/include/asm/mach-netlogic/multi-node.h | |
| parent | d387ac13ad12194a62d268a6b7a0633ef832f6bd (diff) | |
| parent | ffe843b18211301ad25893eba09f402c19d12304 (diff) | |
Merge tag 'dmaengine-fix-4.20-rc6' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Another pull request for dmaengine. We got bunch of fixes early this
week and all are tagged to stable. Hope this is last fix for this
cycle:
- Fix imx-sdma handling of channel terminations, this involves
reverting two commits and implement async termination
- Fix cppi dma channel deletion from pending list on stop
- Fix FIFO size for dw controller in Intel Merrifield"
* tag 'dmaengine-fix-4.20-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: dw: Fix FIFO size for Intel Merrifield
dmaengine: cppi41: delete channel from pending list when stop channel
dmaengine: imx-sdma: use GFP_NOWAIT for dma descriptor allocations
dmaengine: imx-sdma: implement channel termination via worker
Revert "dmaengine: imx-sdma: alloclate bd memory from dma pool"
Revert "dmaengine: imx-sdma: Use GFP_NOWAIT for dma allocations"
Diffstat (limited to 'arch/mips/include/asm/mach-netlogic/multi-node.h')
0 files changed, 0 insertions, 0 deletions