linux-next: manual merge of the iommufd tree with the iommu tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1738 bytes --]

Hi all,

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

  include/linux/iommu.h

between commit:

  2b4de976b360 ("iommu: Pass in the iommu_device to probe for in bus_iommu_probe()")

from the iommu tree and commit:

  c64805327b7d ("iommu: Move dev_iommu_ops() to private header")

from the iommufd 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 include/linux/iommu.h
index 411ce9b998dc,f2d6a3989713..000000000000
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@ -460,19 -459,7 +469,8 @@@ static inline void iommu_iotlb_gather_i
  	};
  }
  
- static inline const struct iommu_ops *dev_iommu_ops(struct device *dev)
- {
- 	/*
- 	 * Assume that valid ops must be installed if iommu_probe_device()
- 	 * has succeeded. The device ops are essentially for internal use
- 	 * within the IOMMU subsystem itself, so we should be able to trust
- 	 * ourselves not to misuse the helper.
- 	 */
- 	return dev->iommu->iommu_dev->ops;
- }
- 
 -extern int bus_iommu_probe(const struct bus_type *bus);
 +extern int bus_iommu_probe(const struct bus_type *bus,
 +			   struct iommu_device *iommu);
  extern bool iommu_present(const struct bus_type *bus);
  extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
  extern bool iommu_group_has_isolated_msi(struct iommu_group *group);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]