diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-02 17:41:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-02 17:41:11 +0200 |
commit | 35fca9f8a999627e3291907992b299b1207baee5 (patch) | |
tree | 3ecb49c11be53bce0991f222b2a8943938fa4025 /kernel/trace/ring_buffer.c | |
parent | Merge tag 'mmc-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulf... (diff) | |
parent | dma-contiguous: page-align the size in dma_free_contiguous() (diff) | |
download | linux-35fca9f8a999627e3291907992b299b1207baee5.tar.xz linux-35fca9f8a999627e3291907992b299b1207baee5.zip |
Merge tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping regression fixes from Christoph Hellwig:
"Two related regression fixes for changes from this merge window to fix
alignment issues introduced in the CMA allocation rework (Nicolin
Chen)"
* tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping:
dma-contiguous: page-align the size in dma_free_contiguous()
dma-contiguous: do not overwrite align in dma_alloc_contiguous()
Diffstat (limited to 'kernel/trace/ring_buffer.c')
0 files changed, 0 insertions, 0 deletions