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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160229152055.3af83d1a@canb.auug.org.au>
Date:	Mon, 29 Feb 2016 15:20:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Joerg Roedel <joro@...tes.org>,
	Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pankaj Dubey <pankaj.dubey@...sung.com>,
	Yong Wu <yong.wu@...iatek.com>,
	Matthias Brugger <matthias.bgg@...il.com>
Subject: 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 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