Re: linux-next: net merge conflicts

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Mar 2008 16:46:11 +1100

> Hi Dave,
> 
> On Fri, 28 Mar 2008 16:04:25 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > On Thu, 27 Mar 2008 20:15:26 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
> > >
> > > I've resolved this merge issue just an hour ago, can you rebuild the
> > > linux-next tree with what I just pushed into my net-2.6.26 tree?
> > 
> > Not today.  next time :-)
> 
> OK, I recreated the tree without doing the intervening builds and a
> powerpc allnoconfig gets this:
> 
> In file included from include/linux/etherdevice.h:29,
>                  from arch/powerpc/kernel/prom_parse.c:9:
> include/linux/netdevice.h: In function âdev_netâ:
> include/linux/netdevice.h:753: error: âinit_netâ undeclared (first use in this function)
> include/linux/netdevice.h:753: error: (Each undeclared identifier is reported only once
> include/linux/netdevice.h:753: error: for each function it appears in.)
> 
> (Today's linux-next also gets this but at line 751.)

When networking is disabled, powerpc probably should not include
networking header files, nor provide networking related arch
specific functions.

For example, I'd recommend that it should not include
linux/etherdevice.h and not emit the of_get_mac_address() function
when CONFIG_NET is not defined.
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»Þ)í…æèw*jg¬±¨¶‰šŽŠÝj/êäz¹ÞŠà2ŠÞ¨è­Ú&¢)ß«a¶Úþø®G«éh®æj:+v‰¨Šwè†Ù