From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Mon, 31 Mar 2014 13:24:57 +1100 [thread overview]
Message-ID: <20140331132457.2d8d71019a52033bbef5b2c2@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
Documentation/devicetree/bindings/net/stmmac.txt between commit
50b4af414d41 ("dts: stmmac: Document the clocks property in the stmmac
base document") from the arm-soc tree and commit e8f08ee0ad86 ("DT: net:
document Ethernet bindings in one place") from the net-next 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 Documentation/devicetree/bindings/net/stmmac.txt
index 9a0c1b7bee29,5748351fb9df..000000000000
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@@ -31,13 -30,7 +30,11 @@@ Optional properties
- resets: Should contain a phandle to the STMMAC reset signal, if any
- reset-names: Should contain the reset signal name "stmmaceth", if a
reset phandle is given
- - max-frame-size: Maximum Transfer Unit (IEEE defined MTU), rather
- than the maximum frame size.
+ - max-frame-size: See ethernet.txt file in the same directory
+- clocks: If present, the first clock should be the GMAC main clock,
+ further clocks may be specified in derived bindings.
+- clocks-names: One name for each entry in the clocks property, the
+ first one should be "stmmaceth".
Examples:
-------------- 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/20140331/d9266fa6/attachment.sig>
next reply other threads:[~2014-03-31 2:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 2:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 2:55 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2021-02-16 2:04 Stephen Rothwell
2021-02-16 2:20 ` nobuhiro1.iwamatsu
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu
2021-02-16 21:17 ` Stephen Rothwell
2021-02-17 0:23 ` Yoshihiro Shimoda
2019-09-05 3:42 Stephen Rothwell
2016-12-01 1:31 Stephen Rothwell
2016-07-27 2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21 1:18 Stephen Rothwell
2016-06-21 8:56 ` Arnd Bergmann
2016-05-10 0:18 Stephen Rothwell
2015-01-27 2:04 Stephen Rothwell
2014-09-25 2:58 Stephen Rothwell
2014-09-10 4:48 Stephen Rothwell
2014-09-10 8:06 ` Arnd Bergmann
2012-01-04 4:06 Stephen Rothwell
2012-01-04 4:46 ` Richard Zhao
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=20140331132457.2d8d71019a52033bbef5b2c2@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).