From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Jan 2019 19:47:26 +0000 (-0800)
Subject: Merge tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e2b745f469ec0f3165ba5ffaee3ce40f98d77878;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "Fix various regressions introduced in this cycles:

   - fix dma-debug tracking for the map_page / map_single
     consolidatation

   - properly stub out DMA mapping symbols for !HAS_DMA builds to avoid
     link failures

   - fix AMD Gart direct mappings

   - setup the dma address for no kernel mappings using the remap
     allocator"

* tag 'dma-mapping-4.21-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING for remapped allocations
  x86/amd_gart: fix unmapping of non-GART mappings
  dma-mapping: remove a few unused exports
  dma-mapping: properly stub out the DMA API for !CONFIG_HAS_DMA
  dma-mapping: remove dmam_{declare,release}_coherent_memory
  dma-mapping: implement dmam_alloc_coherent using dmam_alloc_attrs
  dma-mapping: implement dma_map_single_attrs using dma_map_page_attrs
---

e2b745f469ec0f3165ba5ffaee3ce40f98d77878