From: Ben Hutchings <bhutchings@solarflare.com>Date: Tue, 17 Nov 2009 13:32:54 +0000> You will need to merge Linus's tree into net-next-2.6 and resolve the> conflict by applying Jean's changes to drivers/net/sfc/falcon_boards.c.Ok, I'll sort this out after I next push to Linus, thanks!