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

Pull dma-mapping updates from Christoph Hellwig:

 - rework the non-coherent DMA allocator

 - move private definitions out of <linux/dma-mapping.h>

 - lower CMA_ALIGNMENT (Paul Cercueil)

 - remove the omap1 dma address translation in favor of the common code

 - make dma-direct aware of multiple dma offset ranges (Jim Quinlan)

 - support per-node DMA CMA areas (Barry Song)

 - increase the default seg boundary limit (Nicolin Chen)

 - misc fixes (Robin Murphy, Thomas Tai, Xu Wang)

 - various cleanups

* tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping: (63 commits)
  ARM/ixp4xx: add a missing include of dma-map-ops.h
  dma-direct: simplify the DMA_ATTR_NO_KERNEL_MAPPING handling
  dma-direct: factor out a dma_direct_alloc_from_pool helper
  dma-direct check for highmem pages in dma_direct_alloc_pages
  dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>
  dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma
  dma-mapping: move dma-debug.h to kernel/dma/
  dma-mapping: remove <asm/dma-contiguous.h>
  dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
  dma-contiguous: remove dma_contiguous_set_default
  dma-contiguous: remove dev_set_cma_area
  dma-contiguous: remove dma_declare_contiguous
  dma-mapping: split <linux/dma-mapping.h>
  cma: decrease CMA_ALIGNMENT lower limit to 2
  firewire-ohci: use dma_alloc_pages
  dma-iommu: implement ->alloc_noncoherent
  dma-mapping: add new {alloc,free}_noncoherent dma_map_ops methods
  dma-mapping: add a new dma_alloc_pages API
  dma-mapping: remove dma_cache_sync
  53c700: convert to dma_alloc_noncoherent
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/xen/mm.c
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/mm/init.c
Simple merge

diff --cc arch/microblaze/mm/init.c
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/cavium-octeon/dma-octeon.c
Simple merge

diff --cc arch/mips/kernel/setup.c
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/s390/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/setup.c
index b16caee,e8155e8..84f581c
--- 1/arch/x86/kernel/setup.c
--- 2/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -19,7 -20,7 +20,8 @@@
  #include <linux/hugetlb.h>
  #include <linux/tboot.h>
  #include <linux/usb/xhci-dbgp.h>
 +#include <linux/static_call.h>
+ #include <linux/swiotlb.h>
  
  #include <uapi/linux/mount.h>
  

diff --cc arch/x86/pci/sta2x11-fixup.c
Simple merge

diff --cc arch/xtensa/mm/init.c
Simple merge

diff --cc drivers/acpi/arm64/iort.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/base/dd.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_dma.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun4i_backend.c
Simple merge

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

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

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

diff --cc drivers/iommu/io-pgtable-arm.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
Simple merge

diff --cc drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
Simple merge

diff --cc drivers/usb/core/message.c
Simple merge

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

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

diff --cc kernel/dma/contiguous.c
Simple merge

diff --cc kernel/dma/swiotlb.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory.c
Simple merge