From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@linaro•org>,
Simon Horman <horms@verge•net.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering•com>
Subject: linux-next: manual merge of the clk tree with the renesas tree
Date: Thu, 15 May 2014 16:11:21 +1000 [thread overview]
Message-ID: <20140515161121.39998223@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
between commit b557deadc5cc ("ARM: shmobile: r7s72100: document MSTP
clock support") from the renesas tree and commit 5483bf698f42 ("clk:
shmobile: r8a7779: Add MSTP clock support") from the clk 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 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index b5fc72621bfd,30df825d72ef..000000000000
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@@ -10,7 -10,7 +10,8 @@@ index in the group, from 0 to 31
Required Properties:
- compatible: Must be one of the following
+ - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
+ - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
- "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
- "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
- "renesas,cpg-mstp-clock" for generic MSTP gate clocks
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-15 6:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-15 6:11 Stephen Rothwell [this message]
2014-05-15 6:33 ` linux-next: manual merge of the clk tree with the renesas tree Mike Turquette
-- strict thread matches above, loose matches on Subject: below --
2014-09-10 7:33 Stephen Rothwell
2014-09-10 16:56 ` Mike Turquette
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=20140515161121.39998223@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=horms@verge$(echo .)net.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@linaro$(echo .)org \
--cc=wsa+renesas@sang-engineering$(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