From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Jul 2017 00:17:18 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: MMI-PSA29.97-13-9~5075
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cef55b518c7b83020fc8bcc496402242cc921f29;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

cef55b518c7b83020fc8bcc496402242cc921f29