From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Feb 2020 23:06:38 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.6' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~4450
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a44cac8105059eb756ed4276e932e54e1ba004d;p=platform%2Fkernel%2Flinux-starfive.git

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

0a44cac8105059eb756ed4276e932e54e1ba004d