From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex.williamson@redhat•com>, Al Viro <aviro@redhat•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Howells <dhowells@redhat•com>,
Geert Uytterhoeven <geert+renesas@glider•be>
Subject: linux-next: manual merge of the vfio tree with the vfs tree
Date: Wed, 26 Sep 2018 12:27:31 +1000 [thread overview]
Message-ID: <20180926122621.6645ba87@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]
Hi Alex,
Today's linux-next merge of the vfio tree got a conflict in:
drivers/vfio/Kconfig
between commit:
f57d445eb317 ("Make anon_inodes unconditional")
from the vfs tree and commit:
cf3f98c7f466 ("drivers/vfio: Allow type-1 IOMMU instantiation with all ARM/ARM64 IOMMUs")
from the vfio 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/vfio/Kconfig
index 9aa91e736023,9de5ed38da83..000000000000
--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@@ -21,7 -21,8 +21,7 @@@ config VFIO_VIRQF
menuconfig VFIO
tristate "VFIO Non-Privileged userspace driver framework"
depends on IOMMU_API
- select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU || ARM_SMMU_V3)
+ select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM || ARM64)
- select ANON_INODES
help
VFIO provides a framework for secure userspace device drivers.
See Documentation/vfio.txt for more details.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-09-26 2:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180926122621.6645ba87@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.williamson@redhat$(echo .)com \
--cc=aviro@redhat$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=geert+renesas@glider$(echo .)be \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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