Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Thu, 20 Nov 2008 20:11:02 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 Nov 2008 13:29:41 +1100

> Hi Dave,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ixgbe/ixgbe_main.c between commit
> 79aefa45b20940cbb9104464548ff74f80f2395e ("ixgbe: fix compilation with
> gcc-3.4") from the net-current tree and commit
> 0befdb3e0a26a8949063915274e1bec8873c526b ("ixgbe: add device support for
> 82598AT (copper 10GbE) adapters") from the net tree.
> 
> I fixed it up (see below) and assume you will do something similar.

If you would have pulled 20 minutes later you would have gotten
my tree after sorting out these merge hassles :)