From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Jun 2020 20:06:22 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.8-4' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f05baa066d0f6a38f0624c28008fb2f53cd00e17;p=linux.git

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
---

f05baa066d0f6a38f0624c28008fb2f53cd00e17