diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-27 23:06:22 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-27 23:06:22 +0300 |
commit | f05baa066d0f6a38f0624c28008fb2f53cd00e17 (patch) | |
tree | dad3ee6c3ee12c9727b7eab58a7d8d18e9120e20 /drivers | |
parent | 4e99b32169e84b4ece5a1d74eb0b7e4ef07866b3 (diff) | |
parent | 8e36baf97b252cdcafa53589e8227cbb1e85f0b0 (diff) | |
download | linux-f05baa066d0f6a38f0624c28008fb2f53cd00e17.tar.xz |
Merge tag 'dma-mapping-5.8-4' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
- fix dma coherent mmap in nommu (me)
- more AMD SEV fallout (David Rientjes, me)
- fix alignment in dma_common_*_remap (Eric Auger)
* tag 'dma-mapping-5.8-4' of git://git.infradead.org/users/hch/dma-mapping:
dma-remap: align the size in dma_common_*_remap()
dma-mapping: DMA_COHERENT_POOL should select GENERIC_ALLOCATOR
dma-direct: add missing set_memory_decrypted() for coherent mapping
dma-direct: check return value when encrypting or decrypting memory
dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails
dma-direct: always align allocation size in dma_direct_alloc_pages()
dma-direct: mark __dma_direct_alloc_pages static
dma-direct: re-enable mmap for !CONFIG_MMU
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions