From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.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, David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Bastian Hecht <hechtb@gmail.com>,
Simon Horman <horms+renesas@verge.net.au>
Subject: Re: linux-next: manual merge of the arm-soc tree with the net-next tree
Date: Mon, 17 Jun 2013 17:51:29 +0400 [thread overview]
Message-ID: <51BF1461.8060401@cogentembedded.com> (raw)
In-Reply-To: <20130617163920.04523ba6de50bcc81563f33e@canb.auug.org.au>
Hello.
On 17-06-2013 10:39, Stephen Rothwell wrote:
> 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.
To me that latter commit looked utterly pointless, as there's no
device tree support for the 'sh-eth' driver yet (and at this stage it
isn't even going to happen due to procedural platform data). I'm instead
going to use OF_DEV_AUXDATA() in the platform code which again would
render that commit pointless.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks.
WBR, Sergei
WARNING: multiple messages have this Message-ID (diff)
From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)
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 17:51:29 +0400 [thread overview]
Message-ID: <51BF1461.8060401@cogentembedded.com> (raw)
In-Reply-To: <20130617163920.04523ba6de50bcc81563f33e@canb.auug.org.au>
Hello.
On 17-06-2013 10:39, Stephen Rothwell wrote:
> 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.
To me that latter commit looked utterly pointless, as there's no
device tree support for the 'sh-eth' driver yet (and at this stage it
isn't even going to happen due to procedural platform data). I'm instead
going to use OF_DEV_AUXDATA() in the platform code which again would
render that commit pointless.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks.
WBR, Sergei
next prev parent reply other threads:[~2013-06-17 13:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-17 6:39 linux-next: manual merge of the arm-soc tree with the net-next tree Stephen Rothwell
2013-06-17 6:39 ` Stephen Rothwell
2013-06-17 6:39 ` Stephen Rothwell
2013-06-17 13:51 ` Sergei Shtylyov [this message]
2013-06-17 13:51 ` Sergei Shtylyov
2013-06-18 8:33 ` Bastian Hecht
2013-06-18 8:33 ` Bastian Hecht
2013-06-18 14:36 ` Sergei Shtylyov
2013-06-18 14:36 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2013-07-01 6:28 Stephen Rothwell
2013-07-01 6:28 ` Stephen Rothwell
2013-07-01 6:28 ` Stephen Rothwell
2013-06-21 5:58 Stephen Rothwell
2013-06-21 5:58 ` Stephen Rothwell
2013-06-21 5:58 ` Stephen Rothwell
2013-06-21 5:49 Stephen Rothwell
2013-06-21 5:49 ` Stephen Rothwell
2013-06-21 5:49 ` Stephen Rothwell
2013-06-17 6:43 Stephen Rothwell
2013-06-17 6:43 ` Stephen Rothwell
2013-06-17 6:43 ` Stephen Rothwell
2012-11-26 9:45 Stephen Rothwell
2012-11-26 9:45 ` Stephen Rothwell
2012-11-26 9:45 ` Stephen Rothwell
2012-11-27 11:22 ` Mugunthan V N
2012-11-27 11:22 ` Mugunthan V N
2012-11-27 11:22 ` Mugunthan V N
2012-11-13 4:15 Stephen Rothwell
2012-11-13 4:15 ` Stephen Rothwell
2012-11-13 4:15 ` Stephen Rothwell
2012-11-13 7:21 ` Joachim Eastwood
2012-11-13 7:21 ` Joachim Eastwood
2012-11-13 9:08 ` Stephen Rothwell
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=51BF1461.8060401@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=hechtb@gmail.com \
--cc=horms+renesas@verge.net.au \
--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 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.