Subject: Re: linux-next: net-current/net merge conflict

From: David Miller <[email-masked]>
Date: Sun, 25 May 2008 23:29:58 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 May 2008 13:32:34 +1000

> Today's linux-next merge of the net tree got a trivial conflict in
> drivers/net/cpmac.c between commit
> f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
> enhancements") from the net-current tree and commit
> 7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
> whitespace for several drivers") from the net tree. The former removed a
> comment that the latter made a whitespace fix to.

Thanks Stephen.

I'm trying to do a quick merge of net-2.6 into net-next-2.6
right now and will push the result out to master.kernel.org
after some build sanity tests.

Hopefully that will resolve both of the current merge
conflicts in the networking.