Subject: linux-next: manual merge of the vhost tree with the iommu tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 27 Feb 2019 15:25:06 +1100

Hi all,

Today's linux-next merge of the vhost tree got conflicts in:

  drivers/iommu/Kconfig
  drivers/iommu/Makefile

between commit:

  004240dcc222 ("iommu/hyper-v: Add Hyper-V stub IOMMU driver")

from the iommu tree and commit:

  d906f4225497 ("iommu: Add virtio-iommu driver")

from the vhost 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 6f07f3b21816,d507fd754214..000000000000
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -437,13 -435,15 +437,24 @@@ config QCOM_IOMM
  	help
  	  Support for IOMMU on certain Qualcomm SoCs.
  
 +config HYPERV_IOMMU
 +	bool "Hyper-V x2APIC IRQ Handling"
 +	depends on HYPERV
 +	select IOMMU_API
 +	default HYPERV
 +	help
 +	  Stub IOMMU driver to handle IRQs as to allow Hyper-V Linux
 +	  guests to run with x2APIC mode enabled.
 +
+ config VIRTIO_IOMMU
+ 	bool "Virtio IOMMU driver"
+ 	depends on VIRTIO=y
+ 	depends on ARM64
+ 	select IOMMU_API
+ 	select INTERVAL_TREE
+ 	help
+ 	  Para-virtualised IOMMU driver with virtio.
+ 
+ 	  Say Y here if you intend to run this kernel as a guest.
+ 
  endif # IOMMU_SUPPORT
diff --cc drivers/iommu/Makefile
index 8c71a15e986b,48d831a39281..000000000000
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@ -32,4 -32,4 +32,5 @@@ obj-$(CONFIG_EXYNOS_IOMMU) += exynos-io
  obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o
  obj-$(CONFIG_S390_IOMMU) += s390-iommu.o
  obj-$(CONFIG_QCOM_IOMMU) += qcom_iommu.o
 +obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o
+ obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o