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

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:

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

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