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

Hi Stephen, On Mon, Feb 29, 2016 at 03:20:55PM +1100, Stephen Rothwell wrote: > Hi Joerg, > > Today's linux-next merge of the iommu tree got a conflict in: > > drivers/memory/Kconfig > > between commit: > > 78fbb9361ca3 ("memory: Add support for Exynos SROM driver") > > from the samsung-k

linux-next: manual merge of the iommu tree with the samsung-krzk tree

Hi Joerg, Today's linux-next merge of the iommu tree got a conflict in: drivers/memory/Kconfig between commit: 78fbb9361ca3 ("memory: Add support for Exynos SROM driver") from the samsung-krzk tree and commit: cc8bbe1a8312 ("memory: mediatek: Add SMI driver") from the iommu tree. I fi