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,
Linus Walleij <linus.walleij@linaro•org>,
Tomasz Figa <t.figa@samsung•com>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Thu, 17 Jul 2014 12:01:01 +1000 [thread overview]
Message-ID: <20140717120101.52a8ce26@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/Kconfig between commit ab275b132a79 ("ARM: s5p:
cut the custom ARCH_NR_GPIOS definition") from the arm-soc tree and
commit 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code") 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/arm/plat-samsung/Kconfig
index 6910c8669742,1091b0a3729a..000000000000
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -65,48 -51,22 +51,6 @@@ config SAMSUNG_ATAG
if SAMSUNG_ATAGS
- # clock options
-
- config SAMSUNG_CLOCK
- bool
- default y if !COMMON_CLK
-
- config SAMSUNG_CLKSRC
- bool
- help
- Select the clock code for the clksrc implementation
- used by newer systems such as the S3C64XX.
-
- config S5P_CLOCK
- def_bool ARCH_S5PV210
- help
- Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
-
- # options for IRQ support
-
- config S5P_IRQ
- def_bool ARCH_S5PV210
- help
- Support common interrupt part for ARCH_S5P SoCs
-
- config S5P_EXT_INT
- bool
-config SAMSUNG_GPIO_EXTRA
- int "Number of additional GPIO pins"
- default 128 if SAMSUNG_GPIO_EXTRA128
- default 64 if SAMSUNG_GPIO_EXTRA64
- default 0
-- help
- Use the external interrupts (other than GPIO interrupts.)
- Use additional GPIO space in addition to the GPIO's the SOC
- provides. This allows expanding the GPIO space for use with
- GPIO expanders.
--
- config S5P_GPIO_INT
-config SAMSUNG_GPIO_EXTRA64
-- bool
- help
- Common code for the GPIO interrupts (other than external interrupts.)
-
- # options for gpio configuration support
--
- config S5P_GPIO_DRVSTR
-config SAMSUNG_GPIO_EXTRA128
-- bool
- help
- Internal configuration to get and set correct GPIO driver strength
- helper
--
config S3C_GPIO_SPACE
int "Space between gpio banks"
default 0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-17 2:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 2:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-21 1:13 linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2014-07-17 2:06 Stephen Rothwell
2014-07-17 1:54 Stephen Rothwell
2014-05-26 0:17 Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2013-04-05 5:02 Stephen Rothwell
2013-04-05 6:49 ` Kukjin Kim
2013-02-13 7:39 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-01-18 3:28 Stephen Rothwell
2013-01-18 3:24 Stephen Rothwell
2013-01-18 3:21 Stephen Rothwell
2013-01-11 4:32 Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:59 ` Stephen Rothwell
2013-01-11 4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-09-24 10:52 Stephen Rothwell
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=20140717120101.52a8ce26@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=t.figa@samsung$(echo .)com \
/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