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,
Richard Weinberger <richard@nod.at>,
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Subject: linux-next: manual merge of the clockevents tree with Linus' tree
Date: Wed, 17 Feb 2016 13:38:33 +1100 [thread overview]
Message-ID: <20160217133833.2e5ff923@canb.auug.org.au> (raw)
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/Kconfig
between commit:
863ee050726b ("clocksource/drivers: Fix dependencies for !HAS_IOMEM archs")
from Linus' tree and commit:
0219c41c9e0a ("clocksource/drivers/lpc32xx: Support timer-based ARM delay")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/clocksource/Kconfig
index 33db7406c0e2,04954877d227..000000000000
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -159,7 -152,8 +159,8 @@@ config CLKSRC_EFM3
config CLKSRC_LPC32XX
bool "Clocksource for LPC32XX" if COMPILE_TEST
- depends on GENERIC_CLOCKEVENTS
+ depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
+ depends on ARM
select CLKSRC_MMIO
select CLKSRC_OF
help
next reply other threads:[~2016-02-17 2:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 2:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 4:10 linux-next: manual merge of the clockevents tree with Linus' tree Stephen Rothwell
2019-06-11 5:24 Stephen Rothwell
2016-06-07 3:03 Stephen Rothwell
2013-12-20 4:09 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=20160217133833.2e5ff923@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.lezcano@linaro.org \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard@nod.at \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).