From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>
Subject: linux-next: manual merge of the clockevents tree with the arm-soc tree
Date: Tue, 7 Jun 2016 12:56:20 +1000 [thread overview]
Message-ID: <20160607125620.22fd45c5@canb.auug.org.au> (raw)
Hi Daniel,
Today's linux-next merge of the clockevents tree got conflicts in:
arch/arm/Kconfig
arch/arm/mach-mxs/Kconfig
between commit:
5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the arm-soc tree and commits:
db01e25865a3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option")
b37b0e101e59 ("clocksource/drivers/mxs: Add the COMPILE_TEST option")
from the clockevents tree.
Please keep select lines ordered if they appear to be already.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/Kconfig
index a0af11b90236,0c1f5468a8e7..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -354,8 -354,8 +354,8 @@@ config ARM_SINGLE_ARMV7
config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
- select ARCH_REQUIRE_GPIOLIB
select AUTO_ZRELADDR
- select CLKSRC_MMIO
++ select CLPS711X_TIMER
select COMMON_CLK
select CPU_ARM720T
select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-mxs/Kconfig
index 5d9e5fce7937,68a3a9ec605d..000000000000
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -15,8 -15,8 +15,8 @@@ config SOC_IMX2
config ARCH_MXS
bool "Freescale MXS (i.MX23, i.MX28) support"
depends on ARCH_MULTI_V5
- select CLKSRC_MMIO
- select ARCH_REQUIRE_GPIOLIB
+ select GPIOLIB
+ select MXS_TIMER
select PINCTRL
select SOC_BUS
select SOC_IMX23
next reply other threads:[~2016-06-07 2:56 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 2:56 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-10 3:18 linux-next: manual merge of the clockevents tree with the arm-soc tree Stephen Rothwell
2017-04-10 3:18 ` Stephen Rothwell
2016-07-07 4:12 Stephen Rothwell
2016-07-07 4:12 ` Stephen Rothwell
2016-07-07 4:12 ` Stephen Rothwell
2016-07-11 5:28 ` Stephen Rothwell
2016-07-11 5:28 ` Stephen Rothwell
2016-07-11 5:28 ` Stephen Rothwell
2016-07-15 17:06 ` Daniel Lezcano
2016-07-15 17:06 ` Daniel Lezcano
2016-07-26 22:08 ` Stephen Rothwell
2016-07-26 22:08 ` Stephen Rothwell
2016-07-26 22:08 ` Stephen Rothwell
2016-08-01 23:24 ` Stephen Rothwell
2016-08-01 23:24 ` Stephen Rothwell
2016-08-01 23:24 ` Stephen Rothwell
2016-08-02 1:26 ` Linus Torvalds
2016-08-02 1:26 ` Linus Torvalds
2016-08-02 1:26 ` Linus Torvalds
2016-08-02 1:28 ` Linus Torvalds
2016-08-02 1:28 ` Linus Torvalds
2016-08-02 1:28 ` Linus Torvalds
2014-05-26 5:43 Stephen Rothwell
2014-05-26 5:43 ` Stephen Rothwell
2014-05-26 5:43 ` Stephen Rothwell
2014-05-26 6:03 ` Li.Xiubo
2014-05-26 6:03 ` Li.Xiubo at freescale.com
2014-05-26 6:03 ` Li.Xiubo
2014-05-26 7:49 ` Shawn Guo
2014-05-26 7:49 ` Shawn Guo
2014-05-26 7:49 ` Shawn Guo
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=20160607125620.22fd45c5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.