From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Aug 2020 17:48:17 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.9-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d271b51c60ebe71e0435a9059b315a3d8bb8a099;p=linux.git

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

Pull dma-mapping fixes from Christoph Hellwig:
 "Fix more fallout from the dma-pool changes (Nicolas Saenz Julienne,
  me)"

* tag 'dma-mapping-5.9-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-pool: Only allocate from CMA when in same memory zone
  dma-pool: fix coherent pool allocations for IOMMU mappings
---

d271b51c60ebe71e0435a9059b315a3d8bb8a099