]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit86c797c2a02b045c7148b04fc0627e156b61c7e0
tree5090b5525190dedc16b4e308e9d776fd240b80b3
parent07e220af79e66688f007fa31098f3f650095e583
parent1c9ac6eeee3ed0a1ebbeb3cf33a39586a4e22255
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