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

Pull dma-mapping infrastructure from Christoph Hellwig:
 "This is the first pull request for the new dma-mapping subsystem

  In this new subsystem we'll try to properly maintain all the generic
  code related to dma-mapping, and will further consolidate arch code
  into common helpers.

  This pull request contains:

   - removal of the DMA_ERROR_CODE macro, replacing it with calls to
     ->mapping_error so that the dma_map_ops instances are more self
     contained and can be shared across architectures (me)

   - removal of the ->set_dma_mask method, which duplicates the
     ->dma_capable one in terms of functionality, but requires more
     duplicate code.

   - various updates for the coherent dma pool and related arm code
     (Vladimir)

   - various smaller cleanups (me)"

* tag 'dma-mapping-4.13' of git://git.infradead.org/users/hch/dma-mapping: (56 commits)
  ARM: dma-mapping: Remove traces of NOMMU code
  ARM: NOMMU: Set ARM_DMA_MEM_BUFFERABLE for M-class cpus
  ARM: NOMMU: Introduce dma operations for noMMU
  drivers: dma-mapping: allow dma_common_mmap() for NOMMU
  drivers: dma-coherent: Introduce default DMA pool
  drivers: dma-coherent: Account dma_pfn_offset when used with device tree
  dma: Take into account dma_pfn_offset
  dma-mapping: replace dmam_alloc_noncoherent with dmam_alloc_attrs
  dma-mapping: remove dmam_free_noncoherent
  crypto: qat - avoid an uninitialized variable warning
  au1100fb: remove a bogus dma_free_nonconsistent call
  MAINTAINERS: add entry for dma mapping helpers
  powerpc: merge __dma_set_mask into dma_set_mask
  dma-mapping: remove the set_dma_mask method
  powerpc/cell: use the dma_supported method for ops switching
  powerpc/cell: clean up fixed mapping dma_ops initialization
  tile: remove dma_supported and mapping_error methods
  xen-swiotlb: remove xen_swiotlb_set_dma_mask
  arm: implement ->dma_supported instead of ->set_dma_mask
  mips/loongson64: implement ->dma_supported instead of ->set_dma_mask
  ...

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm64/mm/dma-mapping.c
Simple merge

diff --cc arch/microblaze/Kconfig
index 8e47121b8b8be138e32e325395f40f77ca8ab488,8ba7b7c01418dfb71cddeff0cd121b15183e73f3..4ed8ebf33509e5c5d843e1badf3c548c4bac6420
--- 1/arch/microblaze/Kconfig
--- 2/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -2,9 -2,10 +2,10 @@@ config MICROBLAZ
        def_bool y
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_NO_COHERENT_DMA_MMAP if !MMU
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_EXTABLE_SORT
 -      select CLKSRC_OF
 +      select TIMER_OF
        select CLONE_BACKWARDS3
        select COMMON_CLK
        select GENERIC_ATOMIC64

diff --cc arch/powerpc/platforms/pseries/vio.c
Simple merge

diff --cc arch/s390/pci/pci_dma.c
Simple merge

diff --cc drivers/base/dma-mapping.c
Simple merge

diff --cc drivers/crypto/qat/qat_common/qat_algs.c
Simple merge

diff --cc drivers/iommu/amd_iommu.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge