]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'dma-mapping-5.3-5' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Aug 2019 03:00:11 +0000 (20:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Aug 2019 03:00:11 +0000 (20:00 -0700)
commit7f23c153dfbfcda7aed6c2b12c876208b2deb04c
tree80467ce2e93a2b3300c9900d867db00b16569360
parent3f3cc1f175cfd88857aba601612c047f4b930cea
parenta7266ceff2aa45ffc6080f563a646a712973817d
Merge tag 'dma-mapping-5.3-5' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "Two fixes for regressions in this merge window:

   - select the Kconfig symbols for the noncoherent dma arch helpers on
     arm if swiotlb is selected, not just for LPAE to not break then Xen
     build, that uses swiotlb indirectly through swiotlb-xen

   - fix the page allocator fallback in dma_alloc_contiguous if the CMA
     allocation fails"

* tag 'dma-mapping-5.3-5' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: fix zone selection after an unaddressable CMA allocation
  arm: select the dma-noncoherent symbols for all swiotlb builds