linux-next: manual merge of the iommu tree with the dmaengine-fixes tree

[Stephen Rothwell]

Hi all,

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

  drivers/dma/idxd/init.c

between commit:

  a409e919ca32 ("dmaengine: idxd: Refactor remove call with idxd_cleanup() helper")

from the dmaengine-fixes tree and commit:

  853b01b5efd7 ("dmaengine: idxd: Remove unnecessary IOMMU_DEV_FEAT_IOPF")

from the iommu tree.

I fixed it up (the latter removed a subset of whe the former removed in
idxd_remove()) 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

Attachment: pgpqYu6uZFExt.pgp
Description: OpenPGP digital signature