lkml.org 
[lkml]   [2013]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the net-next tree
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



\
 
 \ /
  Last update: 2013-06-17 16:41    [W:7.919 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site