From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>, Joerg Roedel <joro@8bytes•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Jean-Philippe Brucker <jean-philippe.brucker@arm•com>,
Lan Tianyu <Tianyu.Lan@microsoft•com>
Subject: linux-next: manual merge of the vhost tree with the iommu tree
Date: Wed, 27 Feb 2019 15:25:06 +1100 [thread overview]
Message-ID: <20190227152506.4696a59f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-27 4:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 4:25 Stephen Rothwell [this message]
2019-02-27 11:30 ` linux-next: manual merge of the vhost tree with the iommu tree Jean-Philippe Brucker
2019-02-27 13:58 ` Michael S. Tsirkin
2019-02-28 10:04 ` Joerg Roedel
2019-05-12 17:16 ` Michael S. Tsirkin
2019-05-13 14:29 ` Jean-Philippe Brucker
2019-05-27 9:27 ` Joerg Roedel
2019-05-27 15:16 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190227152506.4696a59f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Tianyu.Lan@microsoft$(echo .)com \
--cc=jean-philippe.brucker@arm$(echo .)com \
--cc=joro@8bytes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox