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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 29 Feb 2016 15:20:55 +1100

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 fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/memory/Kconfig
index bcb19822968b,51d5cd20c26a..000000000000
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@@ -114,7 -114,14 +114,15 @@@ config JZ4780_NEM
  	  the Ingenic JZ4780. This controller is used to handle external
  	  memory devices such as NAND and SRAM.
  
+ config MTK_SMI
+ 	bool
+ 	depends on ARCH_MEDIATEK || COMPILE_TEST
+ 	help
+ 	  This driver is for the Memory Controller module in MediaTek SoCs,
+ 	  mainly help enable/disable iommu and control the power domain and
+ 	  clocks for each local arbiter.
+ 
 +source "drivers/memory/samsung/Kconfig"
  source "drivers/memory/tegra/Kconfig"
  
  endif