From: Mugunthan V N <mugunthanvnm@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Vaibhav Hiremath <hvaibhav@ti.com>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
AnilKumar Ch <anilkumar@ti.com>,
Benoit Cousson <b-cousson@ti.com>, Jon Hunter <jon-hunter@ti.com>,
Afzal Mohammed <afzal@ti.com>,
"Philip, Avinash" <avinashphilip@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the net-next tree
Date: Tue, 27 Nov 2012 16:52:28 +0530 [thread overview]
Message-ID: <50B4A274.5070601@ti.com> (raw)
In-Reply-To: <20121126204546.ef1f1b55e903eda38a61d5d1@canb.auug.org.au>
On 11/26/2012 3:15 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/boot/dts/am33xx.dtsi between commit 1a39a65cba08 ("arm/dts:
> am33xx: Add CPSW and MDIO module nodes for AM33XX") from the net-next
> tree and commits 059b185d5345 ("ARM: dts: AM33XX: Add D_CAN device tree
> data") and 4c94ac29b5c1 ("ARM: dts: OMAP: Move interrupt-parent to the
> root node to avoid duplication") (and a few others that added more later
> nodes) from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Stephen Rothwell
The fix is correct and I have tested CPSW from linux-next.
Regards
Mugunthan V N
next prev parent reply other threads:[~2012-11-27 11:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 9:45 linux-next: manual merge of the arm-soc tree with the net-next tree Stephen Rothwell
2012-11-27 11:22 ` Mugunthan V N [this message]
-- 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
2013-06-17 6:39 Stephen Rothwell
2013-06-17 13:51 ` Sergei Shtylyov
2013-06-18 8:33 ` Bastian Hecht
2013-06-18 14:36 ` Sergei Shtylyov
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=50B4A274.5070601@ti.com \
--to=mugunthanvnm@ti.com \
--cc=afzal@ti.com \
--cc=anilkumar@ti.com \
--cc=arnd@arndb.de \
--cc=avinashphilip@ti.com \
--cc=b-cousson@ti.com \
--cc=davem@davemloft.net \
--cc=hvaibhav@ti.com \
--cc=jon-hunter@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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).