From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Anson Huang <b20788@freescale.com>
Subject: linux-next: manual merge of the imx-mxs tree with the arm-soc tree
Date: Fri, 22 Mar 2013 15:09:41 +1100 [thread overview]
Message-ID: <20130322150941.dd103b83bc0da8a4bcb1647f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c between commit da4a686a2cfb ("ARM:
smp_twd: convert to use CLKSRC_OF init") from the arm-soc tree and commit
371287432334 ("ARM: imx: enable anatop suspend/resume") from the imx-mxs
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/mach-imx/mach-imx6q.c
index b59ddcb,31aee4d..0000000
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -291,8 -257,7 +256,7 @@@ static void __init imx6q_init_irq(void
static void __init imx6q_timer_init(void)
{
mx6q_clocks_init();
- twd_local_timer_of_register();
+ clocksource_of_init();
- imx_print_silicon_rev("i.MX6Q", imx6q_revision());
}
static const char *imx6q_dt_compat[] __initdata = {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-03-22 4:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 4:09 Stephen Rothwell [this message]
2013-04-02 6:55 linux-next: manual merge of the imx-mxs tree with the arm-soc tree Stephen Rothwell
2013-04-02 6:57 Stephen Rothwell
2013-04-10 7:33 Stephen Rothwell
2013-06-03 5:41 Stephen Rothwell
2013-06-19 6:24 Stephen Rothwell
2014-01-05 23:38 Stephen Rothwell
2014-01-05 23:42 Stephen Rothwell
2014-02-20 0:42 Stephen Rothwell
2014-02-20 1:30 ` Shawn Guo
2014-03-03 1:58 Stephen Rothwell
2015-01-13 0:16 Stephen Rothwell
2015-01-13 13:18 ` Arnd Bergmann
2015-01-13 20:29 ` Stephen Rothwell
2015-05-21 0:58 Stephen Rothwell
2015-06-01 0:54 Stephen Rothwell
2017-10-30 11:58 Mark Brown
2018-03-26 22:10 Stephen Rothwell
2018-03-27 7:55 ` Shawn Guo
2018-03-27 7:59 ` Arnd Bergmann
2019-04-29 23:49 Stephen Rothwell
2019-05-06 0:43 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=20130322150941.dd103b83bc0da8a4bcb1647f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=b20788@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.com \
--cc=shawn.guo@linaro.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 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).