Subject: linux-next: manual merge of the net-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Nov 2012 10:53:18 +1100

Hi all,

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).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index bd1fd3d,0546cf4..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -11899,22 -12065,10 +12066,20 @@@ static int __devinit bnx2x_init_one(str
  	/* calc qm_cid_count */
  	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
  
- #ifdef BCM_CNIC
- 	/* disable FCOE L2 queue for E1x */
+ 	/* disable FCOE L2 queue for E1x*/
  	if (CHIP_IS_E1x(bp))
  		bp->flags |= NO_FCOE_FLAG;
+ 
 +	/* disable FCOE for 57840 device, until FW supports it */
 +	switch (ent->driver_data) {
 +	case BCM57840_O:
 +	case BCM57840_4_10:
 +	case BCM57840_2_20:
 +	case BCM57840_MFO:
 +	case BCM57840_MF:
 +		bp->flags |= NO_FCOE_FLAG;
 +	}
- #endif
- 
 +
  	/* Set bp->num_queues for MSI-X mode*/
  	bnx2x_set_num_queues(bp);