linux-next: manual merge of the iommu tree with the asm-generic tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the iommu tree got a conflict in:

  drivers/iommu/Kconfig

between commit:

  cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")

from the asm-generic tree and commit:

  c76c067e488c ("s390/pci: Use dma-iommu layer")

from the iommu tree.

I fixed it up (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 drivers/iommu/Kconfig
index 7f04491ca5f0,3199fd54b462..000000000000
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -91,7 -91,7 +91,7 @@@ config IOMMU_DEBUGF
  choice
  	prompt "IOMMU default domain type"
  	depends on IOMMU_API
- 	default IOMMU_DEFAULT_DMA_LAZY if X86
 -	default IOMMU_DEFAULT_DMA_LAZY if X86 || IA64 || S390
++	default IOMMU_DEFAULT_DMA_LAZY if X86 || S390
  	default IOMMU_DEFAULT_DMA_STRICT
  	help
  	  Choose the type of IOMMU domain used to manage DMA API usage by
@@@ -146,7 -146,7 +146,7 @@@ config OF_IOMM
  
  # IOMMU-agnostic DMA-mapping layer
  config IOMMU_DMA
- 	def_bool ARM64 || X86
 -	def_bool ARM64 || IA64 || X86 || S390
++	def_bool ARM64 || X86 || S390
  	select DMA_OPS
  	select IOMMU_API
  	select IOMMU_IOVA

Attachment: pgpr4K3rjNfOn.pgp
Description: OpenPGP digital signature