Subject: linux-next: manual merge of the iommu tree with the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 28 Jun 2016 13:13:10 +1000

Hi Joerg,

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

  drivers/iommu/mtk_iommu.c

between commit:

  d267804c8457 ("iommu: convert DT component matching to component_match_add_release()")

from the arm tree and commit:

  9ca340c98c0d ("iommu/mediatek: move the common struct into header file")

from the iommu 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/mtk_iommu.c
index c036df1c49ca,b12c12d74c33..000000000000
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@@ -552,30 -524,6 +524,11 @@@ static int mtk_iommu_hw_init(const stru
  	return 0;
  }
  
- static int compare_of(struct device *dev, void *data)
- {
- 	return dev->of_node == data;
- }
- 
 +static void release_of(struct device *dev, void *data)
 +{
 +	of_node_put(data);
 +}
 +
- static int mtk_iommu_bind(struct device *dev)
- {
- 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
- 
- 	return component_bind_all(dev, &data->smi_imu);
- }
- 
- static void mtk_iommu_unbind(struct device *dev)
- {
- 	struct mtk_iommu_data *data = dev_get_drvdata(dev);
- 
- 	component_unbind_all(dev, &data->smi_imu);
- }
- 
  static const struct component_master_ops mtk_iommu_com_ops = {
  	.bind		= mtk_iommu_bind,
  	.unbind		= mtk_iommu_unbind,