Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2018 10:06:43 +0000 (11:06 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2018 10:06:43 +0000 (11:06 +0100)
commit70408a9987d1ffac006e21b965f0c30dd22b0af2
tree381e658177d4fe472d89787a7b6e2e68208354ca
parenta4648c75b95d972e08f84529c4e8ee4f81cf09e4
parent02b4da5f84d157f6a27e05ca017bdb74bcf01bee
Merge tag 'please-pull-next' of git://git./linux/kernel/git/aegl/linux

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
arch/ia64/include/asm/dma-mapping.h
arch/ia64/sn/pci/pci_dma.c
drivers/iommu/intel-iommu.c