Merge tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap

Pull ioremap updates from Christoph Hellwig:
 "Remove the ioremap_nocache API (plus wrappers) that are always
  identical to ioremap"

* tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap:
  remove ioremap_nocache and devm_ioremap_nocache
  MIPS: define ioremap_nocache to ioremap

diff --cc drivers/atm/eni.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/qplib_fp.c
Simple merge

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

diff --cc drivers/mmc/host/sdhci-acpi.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
Simple merge

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