From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kukjin Kim <kgene.kim@samsung•com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd•com>,
Alim Akhtar <alim.akhtar@samsung•com>,
Naveen Krishna Ch <naveenkrishna.ch@gmail•com>,
Abhilash Kesavan <a.kesavan@samsung•com>
Subject: linux-next: manual merge of the samsung tree with the tree
Date: Mon, 1 Dec 2014 11:06:10 +1100 [thread overview]
Message-ID: <20141201110610.2126988c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]
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@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-01 0:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-01 0:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 1:20 linux-next: manual merge of the samsung tree with the tree Stephen Rothwell
2014-05-23 2:02 ` Kukjin Kim
2010-05-20 1:04 Stephen Rothwell
2010-05-20 1:46 ` Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141201110610.2126988c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Suravee.Suthikulpanit@amd$(echo .)com \
--cc=a.kesavan@samsung$(echo .)com \
--cc=alim.akhtar@samsung$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=naveenkrishna.ch@gmail$(echo .)com \
--cc=olof@lixom$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox