Re: linux-next: net merge conflicts

[David Miller]

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html