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)
commitcef55b518c7b83020fc8bcc496402242cc921f29
tree19a7b10bbeb1fc5086efa058dc091030a70a2495
parent25f6a53799d667283d3bee29a6ac75ae3dae38dc
parent878ec36765fa71ffe656bc003d25bb9f8bad28f9
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