From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Apr 2020 17:12:47 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~4146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f43bae38269a55534e1f86a9917318167de6639;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - fix an integer overflow in the coherent pool (Kevin Grandemange)

 - provide support for in-place uncached remapping and use that for
   openrisc

 - fix the arm coherent allocator to take the bus limit into account

* tag 'dma-mapping-5.7' of git://git.infradead.org/users/hch/dma-mapping:
  ARM/dma-mapping: merge __dma_supported into arm_dma_supported
  ARM/dma-mapping: take the bus limit into account in __dma_alloc
  ARM/dma-mapping: remove get_coherent_dma_mask
  openrisc: use the generic in-place uncached DMA allocator
  dma-direct: provide a arch_dma_clear_uncached hook
  dma-direct: make uncached_kernel_address more general
  dma-direct: consolidate the error handling in dma_direct_alloc_pages
  dma-direct: remove the cached_kernel_address hook
  dma-coherent: fix integer overflow in the reserved-memory dma allocation
---

6f43bae38269a55534e1f86a9917318167de6639