On 2020-05-07 05:58, Stephen Rothwell wrote:
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.
Hi Stephen,
Your proposition is correct for me.
I of course assume that the other parts of the
("s390/pci: adaptation of iommu to multifunction")
patch, not concerned by this merge problem, will be merged too at the end.
Thanks,
Pierre
--
Pierre Morel
IBM Lab Boeblingen
