Merge tag 'dma-mapping-5.9-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Aug 2020 17:48:17 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Aug 2020 17:48:17 +0000 (10:48 -0700)
commitd271b51c60ebe71e0435a9059b315a3d8bb8a099
tree5090b5525190dedc16b4e308e9d776fd240b80b3
parentba8e42077bbe046a09bdb965dbfbf8c27594fe8f
parentd7e673ec2c8e0ea39c4c70fc490d67d7fbda869d
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