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

Hi all, On Thu, 30 Jul 2020 15:20:06 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the iommu tree got a conflict in: > > drivers/iommu/Kconfig > > between commit: > > 2f9237d4f6df ("dma-mapping: make support for dma ops optional") > > from the dma-mapping tree and

linux-next: manual merge of the iommu tree with the dma-mapping tree

Hi all, Today's linux-next merge of the iommu tree got a conflict in: drivers/iommu/Kconfig between commit: 2f9237d4f6df ("dma-mapping: make support for dma ops optional") from the dma-mapping tree and commit: ab65ba57e3ac ("iommu/vt-d: Move Kconfig and Makefile bits down into intel