Re: linux-next: manual merge of the net-next tree with Linus' tree
From: David Miller <davem@davemloft.net>
Date: 2012-11-10 23:34:37
Also in:
linux-next, lkml
From: Stephen Rothwell <redacted> Date: Fri, 9 Nov 2012 10:53:18 +1100
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit
477864ddd365 ("bnx2x: Disable FCoE for 57840 since not yet supported by
FW") from Linus' tree and commit 55c11941e382 ("bnx2x: Support loading
cnic resources at run-time") from the net-next tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).I'm pulling 'net' into 'net-next' and this is exactly how I will resolve this conflict. Thanks Stephen.