linux-next: manual merge of the vfio tree with the vfs tree

linux-next: manual merge of the vfio tree with the vfs tree

[Stephen Rothwell]

[-- 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 --]