]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jul 2017 00:17:18 +0000 (17:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jul 2017 00:17:18 +0000 (17:17 -0700)
commit9a12bff63b7afc60f2ce036280343cfcecb8a292
tree19a7b10bbeb1fc5086efa058dc091030a70a2495
parent066c389b62e3c17f15c9a9507ed37c5e6ec40fa0
parent93a7487d12abf51cfc317871c8a220ced8fc792b
Merge tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma mapping fixes from Christoph Hellwig:
 "split the global dma coherent pool from the per-device pool.

  This fixes a regression in the earlier 4.13 pull requests where the
  global pool would override a per-device CMA pool (Vladimir Murzin)"

* tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping:
  ARM: NOMMU: Wire-up default DMA interface
  dma-coherent: introduce interface for default DMA pool