Merge tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 23:06:38 +0000 (15:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Feb 2020 23:06:38 +0000 (15:06 -0800)
commit0a44cac8105059eb756ed4276e932e54e1ba004d
tree5550d42487720100990fc71d324a1cd2ebd9809d
parent2b72104b8c12504176fb5fc1442d6e54e31e338b
parent75467ee48a5e04cf3ae3cb39aea6adee73aeff91
Merge tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:

 - give command line cma= precedence over the CONFIG_ option (Nicolas
   Saenz Julienne)

 - always allow 32-bit DMA, even for weirdly placed ZONE_DMA

 - improve the debug printks when memory is not addressable, to help
   find problems with swiotlb initialization

* tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: improve DMA mask overflow reporting
  dma-direct: improve swiotlb error reporting
  dma-direct: relax addressability checks in dma_direct_supported
  dma-contiguous: CMA: give precedence to cmdline