linux-kernel - linux-next: manual merge of the samsung tree with the 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>] [day] [month] [year] [list]

Message-ID: <20141201110610.2126988c@canb.auug.org.au>
Date:	Mon, 1 Dec 2014 11:06:10 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>,
	Alim Akhtar <alim.akhtar@...sung.com>,
	Naveen Krishna Ch <naveenkrishna.ch@...il.com>,
	Abhilash Kesavan <a.kesavan@...sung.com>
Subject: linux-next: manual merge of the samsung tree with the  tree

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm64/Kconfig between commit 419043609689 ("arm64: amd-seattle:
Adding device tree for AMD Seattle platform") from the arm-soc tree and
commit ab93f6ca6394 ("arm64: Enable ARMv8 based exynos7 SoC support")
from the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm64/Kconfig
index 44cb996e3cd7,7351199f0a42..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -142,11 -142,23 +142,28 @@@ source "kernel/Kconfig.freezer
  
  menu "Platform selection"
  
 +config ARCH_SEATTLE
 +	bool "AMD Seattle SoC Family"
 +	help
 +	  This enables support for AMD Seattle SOC Family
 +
+ config ARCH_EXYNOS
+ 	bool
+ 	help
+ 	  This enables support for Samsung Exynos SoC family
+ 
+ config ARCH_EXYNOS7
+ 	bool "ARMv8 based Samsung Exynos7"
+ 	select ARCH_EXYNOS
+ 	select COMMON_CLK_SAMSUNG
+ 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
+ 	select HAVE_S3C_RTC if RTC_CLASS
+ 	select PINCTRL
+ 	select PINCTRL_EXYNOS
+ 
+ 	help
+ 	  This enables support for Samsung Exynos7 SoC family
+ 
  config ARCH_THUNDER
  	bool "Cavium Inc. Thunder SoC Family"
  	help

Content of type "application/pgp-signature" skipped