From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@st.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Fri, 17 Jan 2014 14:14:20 +1100 [thread overview]
Message-ID: <20140117141420.e70ad2837f74fcff6a7f4a9d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit
6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy
node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") from the devicetree
tree.
I fixed it up (removed the line) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@st.com>,
Jason Cooper <jason@lakedaemon.net>
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Fri, 17 Jan 2014 14:14:20 +1100 [thread overview]
Message-ID: <20140117141420.e70ad2837f74fcff6a7f4a9d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit
6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy
node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") from the devicetree
tree.
I fixed it up (removed the line) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree
Date: Fri, 17 Jan 2014 14:14:20 +1100 [thread overview]
Message-ID: <20140117141420.e70ad2837f74fcff6a7f4a9d@canb.auug.org.au> (raw)
Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts between commit
6b6430e82331 ("ARM: orion5x: Fix typo in device_type property of phy
node") from the arm-soc tree and commit 40aad3c1a9b6 ("dt/bindings:
Remove all references to device_type "ethernet-phy"") from the devicetree
tree.
I fixed it up (removed the line) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- 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/20140117/b853f499/attachment.sig>
next reply other threads:[~2014-01-17 3:14 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 3:14 Stephen Rothwell [this message]
2014-01-17 3:14 ` linux-next: manual merge of the devicetree tree with the arm-soc tree Stephen Rothwell
2014-01-17 3:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-05-22 6:03 Stephen Rothwell
2020-05-22 6:03 ` Stephen Rothwell
2020-05-22 8:08 ` Arnd Bergmann
2020-05-22 8:08 ` Arnd Bergmann
2019-11-14 2:21 Stephen Rothwell
2019-11-14 2:21 ` Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell
2019-12-03 0:04 ` Stephen Rothwell
2017-11-09 2:26 Stephen Rothwell
2017-11-09 2:26 ` Stephen Rothwell
2017-11-09 2:21 Stephen Rothwell
2017-11-09 2:21 ` Stephen Rothwell
2016-06-27 3:42 Stephen Rothwell
2016-06-27 3:42 ` Stephen Rothwell
2016-06-27 3:42 ` Stephen Rothwell
2014-03-12 22:03 Mark Brown
2014-03-12 22:36 ` Olof Johansson
2014-03-13 12:55 ` Grant Likely
2014-01-17 3:11 Stephen Rothwell
2014-01-17 3:11 ` Stephen Rothwell
2014-01-17 3:11 ` Stephen Rothwell
2014-01-17 3:08 Stephen Rothwell
2014-01-17 3:08 ` Stephen Rothwell
2014-01-17 3:08 ` Stephen Rothwell
2014-01-17 4:35 ` Jason Cooper
2014-01-17 4:35 ` Jason Cooper
2014-01-17 4:35 ` Jason Cooper
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=20140117141420.e70ad2837f74fcff6a7f4a9d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=grant.likely@secretlab.ca \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=srinivas.kandagatla@st.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.