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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Dec 2008 14:16:58 +1100

Hi Dave,

Today's linux-next merge of the net tree got a conflict in drivers/net/ixgbe/ixgbe_main.c between commit 43ced651d1272ced02ed5f1c2abc79e3354187f6 ("ixgbe section fixes") from Linus' tree and commit ixgbe_init_interrupt_scheme ("ixgbe: this patch adds support for DCB to the kernel and ixgbe driver") from the net tree.

I used the latter version (ixgbe_init_interrupt_scheme() is now not
static and both patches removed the __devinit annotation).  This could be
fixed up by merging Linus' tree into the net tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/