linux-next: manual merge of the ia64 tree with the dma-mapping tree

Hi all, Today's linux-next merge of the ia64 tree got a conflict in: arch/ia64/sn/pci/pci_dma.c between commit: f9f3232a7d0ab73a3 ("dma-mapping: explicitly wire up ->mmap and ->get_sgtable") from the dma-mapping tree and commit: cf07cb1ff4ea008ab ("ia64: remove support for the SGI SN2

linux-next: manual merge of the ia64 tree with the dma-mapping tree

Hi all, Today's linux-next merge of the ia64 tree got a conflict in: arch/ia64/hp/common/sba_iommu.c between commit: f9f3232a7d0ab73 ("dma-mapping: explicitly wire up ->mmap and ->get_sgtable") from the dma-mapping tree and commit: 974f83ec1e5afee ("ia64: rework iommu probing")

linux-next: manual merge of the ia64 tree with the dma-mapping tree

Hi all, Today's linux-next merge of the ia64 tree got a conflict in: arch/ia64/hp/common/sba_iommu.c arch/ia64/sn/pci/pci_dma.c between commit: f9f3232a7d0a ("dma-mapping: explicitly wire up ->mmap and ->get_sgtable") from the dma-mapping tree and commits: 974f83ec1e5a ("ia64: rework