From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Nov 2017 00:54:12 +0000 (-0800)
Subject: Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~10025
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e37e0ee0190034a059c9faea8adfb4982fb24ddd;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull dma-mapping updates from Christoph Hellwig:

 - turn dma_cache_sync into a dma_map_ops instance and remove
   implementation that purely are dead because the architecture doesn't
   support noncoherent allocations

 - add a flag for busses that need DMA configuration (Robin Murphy)

* tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: turn dma_cache_sync into a dma_map_ops method
  sh: make dma_cache_sync a no-op
  xtensa: make dma_cache_sync a no-op
  unicore32: make dma_cache_sync a no-op
  powerpc: make dma_cache_sync a no-op
  mn10300: make dma_cache_sync a no-op
  microblaze: make dma_cache_sync a no-op
  ia64: make dma_cache_sync a no-op
  frv: make dma_cache_sync a no-op
  x86: make dma_cache_sync a no-op
  floppy: consolidate the dummy fd_cacheflush definition
  drivers: flag buses which demand DMA configuration
---

e37e0ee0190034a059c9faea8adfb4982fb24ddd