Merge tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jul 2019 19:09:52 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jul 2019 19:09:52 +0000 (12:09 -0700)
commitac60602a6d8f6830dee89f4b87ee005f62eb7171
treeea8810e0d7abc82755c8db00904015ecbf99a8b4
parentc6dd78fcb8eefa15dd861889e0f59d301cb5230c
parent449fa54d6815be8c2c1f68fa9dbbae9384a7c03e
Merge tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "Fix various regressions:

   - force unencrypted dma-coherent buffers if encryption bit can't fit
     into the dma coherent mask (Tom Lendacky)

   - avoid limiting request size if swiotlb is not used (me)

   - fix swiotlb handling in dma_direct_sync_sg_for_cpu/device (Fugang
     Duan)"

* tag 'dma-mapping-5.3-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: correct the physical addr in dma_direct_sync_sg_for_cpu/device
  dma-direct: only limit the mapping size if swiotlb could be used
  dma-mapping: add a dma_addressing_limited helper
  dma-direct: Force unencrypted DMA under SME for certain DMA masks
arch/s390/mm/init.c
arch/x86/Kconfig
arch/x86/mm/mem_encrypt.c