Re: linux-next: net merge conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.)

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp0a7hsIAJDo.pgp
Description: PGP signature


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux 802.1Q VLAN]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Git]     [Bugtraq]     [Yosemite News and Information]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux PCI]     [Linux Admin]     [Samba]

  Powered by Linux