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 sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpGt4mgz2fuE.pgp
Description: PGP signature
