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

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

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

Hi all,

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

  drivers/iommu/s390-iommu.c

between commit:

  d08d6f5d7524 ("s390/pci: adaptation of iommu to multifunction")

from the s390 tree and commit:

  522af649e57b ("iommu/s390: Convert to probe/release_device() call-backs")

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/s390-iommu.c
index c60d5c776fc6,610f0828f22d..000000000000
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@@ -166,23 -166,16 +166,16 @@@ static void s390_iommu_detach_device(st
  	}
  }
  
- static int s390_iommu_add_device(struct device *dev)
+ static struct iommu_device *s390_iommu_probe_device(struct device *dev)
  {
- 	struct iommu_group *group = iommu_group_get_for_dev(dev);
 -	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;
 +	struct zpci_dev *zdev = to_zpci_dev(dev);
  
- 	if (IS_ERR(group))
- 		return PTR_ERR(group);
- 
- 	iommu_group_put(group);
- 	iommu_device_link(&zdev->iommu_dev, dev);
- 
- 	return 0;
+ 	return &zdev->iommu_dev;
  }
  
- static void s390_iommu_remove_device(struct device *dev)
+ static void s390_iommu_release_device(struct device *dev)
  {
 -	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;
 +	struct zpci_dev *zdev = to_zpci_dev(dev);
  	struct iommu_domain *domain;
  
  	/*

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