From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the net-next tree
Date: Mon, 17 Jun 2013 16:39:20 +1000 [thread overview]
Message-ID: <20130617163920.04523ba6de50bcc81563f33e@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/clock-r8a7740.c between commit e5c9b4cd6651
("sh_eth: get R8A7740 support out of #ifdef") from the net-next tree and
commit 9e0b428f079d ("ARM: shmobile: r8a7740: Add interim sh-eth device
name to clocks list") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
index ae93f94,7fd32d6..0000000
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@@ -591,7 -594,9 +594,9 @@@ static struct clk_lookup lookups[] =
CLKDEV_DEV_ID("e6860000.sdhi", &mstp_clks[MSTP313]),
CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]),
CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]),
- CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP309]),
+ CLKDEV_DEV_ID("r8a7740-gether", &mstp_clks[MSTP309]),
+ CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]),
+ CLKDEV_DEV_ID("renesas_tpu_pwm", &mstp_clks[MSTP304]),
CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]),
CLKDEV_DEV_ID("e6870000.sdhi", &mstp_clks[MSTP415]),
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130617/bb543429/attachment-0001.sig>
next reply other threads:[~2013-06-17 6:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 6:39 Stephen Rothwell [this message]
2013-06-17 13:51 ` linux-next: manual merge of the arm-soc tree with the net-next tree Sergei Shtylyov
2013-06-18 8:33 ` Bastian Hecht
2013-06-18 14:36 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2013-07-01 6:28 Stephen Rothwell
2013-06-21 5:58 Stephen Rothwell
2013-06-21 5:49 Stephen Rothwell
2013-06-17 6:43 Stephen Rothwell
2012-11-26 9:45 Stephen Rothwell
2012-11-27 11:22 ` Mugunthan V N
2012-11-13 4:15 Stephen Rothwell
2012-11-13 7:21 ` Joachim Eastwood
2012-11-13 9:08 ` 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=20130617163920.04523ba6de50bcc81563f33e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-arm-kernel@lists.infradead.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).