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

[Stephen Rothwell]

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 iommu probing")
  cf07cb1ff4ea ("ia64: remove support for the SGI SN2 platform")

from the ia64 tree.

I fixed it up (I removed the second file and see below) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/ia64/hp/common/sba_iommu.c
index 4c0ea6c2833d,a7eff5e6d260..000000000000
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@@ -2062,6 -2055,22 +2055,24 @@@ static int __init acpi_sba_ioc_init_acp
  /* This has to run before acpi_scan_init(). */
  arch_initcall(acpi_sba_ioc_init_acpi);
  
+ static int sba_dma_supported (struct device *dev, u64 mask)
+ {
+ 	/* make sure it's at least 32bit capable */
+ 	return ((mask & 0xFFFFFFFFUL) == 0xFFFFFFFFUL);
+ }
+ 
+ static const struct dma_map_ops sba_dma_ops = {
+ 	.alloc			= sba_alloc_coherent,
+ 	.free			= sba_free_coherent,
+ 	.map_page		= sba_map_page,
+ 	.unmap_page		= sba_unmap_page,
+ 	.map_sg			= sba_map_sg_attrs,
+ 	.unmap_sg		= sba_unmap_sg_attrs,
+ 	.dma_supported		= sba_dma_supported,
++	.mmap			= dma_common_mmap,
++	.get_sgtable		= dma_common_get_sgtable,
+ };
+ 
  static int __init
  sba_init(void)
  {

Attachment: pgpV641nicoPL.pgp
Description: OpenPGP digital signature