Re: linux-next: net merge conflicts

[Stephen Rothwell]

Hi Dave,

On Fri, 28 Mar 2008 16:22:00 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: David Miller <davem@xxxxxxxxxxxxx>
> Date: Fri, 28 Mar 2008 00:33:11 -0700 (PDT)
> 
> > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Date: Fri, 28 Mar 2008 17:55:30 +1100
> > 
> > > OK, I always thought that we didn't like conditional includes and that
> > > include files should make themselves safe from being included in
> > > unexpected circumstances. In particular, until now these include files
> > > have not caused problems ...
> > 
> > Stephen is this enough to fix your powerpc build failure?
> 
> Tired of waiting for your response, I checked this in
> anyways.

Sorry, had to go home and do people stuff :-)

We'll see if I get today's linux-next finished.

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

Attachment: pgp00000.pgp
Description: PGP signature