Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

Pull ia64 updates from Tony Luck:
 "Miscellaneous ia64 fixes from Christoph"

* tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  intel-iommu: mark intel_dma_ops static
  ia64: remove machvec_dma_sync_{single,sg}
  ia64/sn2: remove no-ops dma sync methods
  ia64: remove the unused iommu_dma_init function
  ia64: remove the unused pci_iommu_shutdown function
  ia64: remove the unused bad_dma_address symbol
  ia64: remove iommu_dma_supported
  ia64: remove the dead iommu_sac_force variable
  ia64: remove the kern_mem_attribute export

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

diff --cc arch/ia64/sn/pci/pci_dma.c
index 96eb2567718a29e71dbcf9e91bf01ed1e4ff80d8,3b944fba0a3eb62d3cd84c03f250c09d6209eef2..4ce4ee4ef9f2c7b74b48fdc19c2d4706f6fab173
--- 1/arch/ia64/sn/pci/pci_dma.c
--- 2/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@@ -466,13 -442,8 +441,9 @@@ static struct dma_map_ops sn_dma_ops = 
        .unmap_page             = sn_dma_unmap_page,
        .map_sg                 = sn_dma_map_sg,
        .unmap_sg               = sn_dma_unmap_sg,
-       .sync_single_for_cpu    = sn_dma_sync_single_for_cpu,
-       .sync_sg_for_cpu        = sn_dma_sync_sg_for_cpu,
-       .sync_single_for_device = sn_dma_sync_single_for_device,
-       .sync_sg_for_device     = sn_dma_sync_sg_for_device,
        .mapping_error          = sn_dma_mapping_error,
        .dma_supported          = sn_dma_supported,
 +      .get_required_mask      = sn_dma_get_required_mask,
  };
  
  void sn_dma_init(void)

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