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

diff --cc arch/alpha/include/asm/dma-mapping.h
Simple merge

diff --cc arch/cris/include/asm/dma-mapping.h
Simple merge

diff --cc arch/frv/include/asm/dma-mapping.h
Simple merge

diff --cc arch/ia64/include/asm/dma-mapping.h
Simple merge

diff --cc arch/m32r/include/asm/dma-mapping.h
Simple merge

diff --cc arch/m68k/include/asm/dma-mapping.h
Simple merge

diff --cc arch/metag/include/asm/dma-mapping.h
Simple merge

diff --cc arch/microblaze/kernel/dma.c
Simple merge

diff --cc arch/mips/include/asm/dma-mapping.h
Simple merge

diff --cc arch/parisc/include/asm/dma-mapping.h
Simple merge

diff --cc arch/parisc/kernel/pci-dma.c
Simple merge

diff --cc arch/powerpc/include/asm/dma-mapping.h
Simple merge

diff --cc arch/s390/include/asm/dma-mapping.h
Simple merge

diff --cc arch/sh/include/asm/dma-mapping.h
Simple merge

diff --cc arch/sparc/include/asm/dma-mapping.h
Simple merge

diff --cc arch/sparc/include/asm/floppy_32.h
Simple merge

diff --cc arch/sparc/include/asm/floppy_64.h
Simple merge

diff --cc arch/x86/include/asm/dma-mapping.h
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/dma-mapping.h
Simple merge