linux-next: manual merge of the driver-core tree with the iommu tree

[broonie@xxxxxxxxxx]

Hi all,

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

  include/linux/iommu.h

between commit:

  f7f9c054a227a ("iommu: Remove iommu_group_get_by_id()")

from the iommu tree and commit:

  b18d0a0f92a8f ("iommu: make the pointer to struct bus_type constant")

from the driver-core 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.

diff --cc include/linux/iommu.h
index ad238d6e4677b,0fd4e6734d5b2..0000000000000
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@ -455,11 -455,12 +455,11 @@@ static inline const struct iommu_ops *d
  	return dev->iommu->iommu_dev->ops;
  }
  
- extern int bus_iommu_probe(struct bus_type *bus);
- extern bool iommu_present(struct bus_type *bus);
+ extern int bus_iommu_probe(const struct bus_type *bus);
+ 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);
- extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
+ extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);
 -extern struct iommu_group *iommu_group_get_by_id(int id);
  extern void iommu_domain_free(struct iommu_domain *domain);
  extern int iommu_attach_device(struct iommu_domain *domain,
  			       struct device *dev);