diff options
| author | Linus Torvalds | 2013-12-20 12:27:41 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-12-20 12:27:41 -0800 |
| commit | eaadcfeb31e959028dfa2cc48741e126e3e15b28 (patch) | |
| tree | 055e115973c57c246291bd262a5d7f014a1ddad2 /mm/shmem.c | |
| parent | 46dd0835cacd149a981254864af9f41e7c841a94 (diff) | |
| parent | 77873803363c9e831fc1d1e6895c084279090c22 (diff) | |
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()
Diffstat (limited to 'mm/shmem.c')
0 files changed, 0 insertions, 0 deletions