Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c between commit
4864a16ae69d ("bnx2x: Fix fastpath structures when memory allocation
fails") from the net tree and commit 8ca5e17e58c9 ("bnx2x: Support of PF
driver of a VF acquire request") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index f771ddf,00706c4..0000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@@ -87,30 -85,33 +85,58 @@@ static inline void bnx2x_move_fp(struc
  }
  
  /**
 + * bnx2x_shrink_eth_fp - guarantees fastpath structures stay intact
 + *
 + * @bp:	driver handle
 + * @delta:	number of eth queues which were not allocated
 + */
 +static void bnx2x_shrink_eth_fp(struct bnx2x *bp, int delta)
 +{
 +	int i, cos, old_eth_num = BNX2X_NUM_ETH_QUEUES(bp);
 +
 +	/* Queue pointer cannot be re-set on an fp-basis, as moving pointer
 +	 * backward along the array could cause memory to be overriden
 +	 */
 +	for (cos = 1; cos < bp->max_cos; cos++) {
 +		for (i = 0; i < old_eth_num - delta; i++) {
 +			struct bnx2x_fastpath *fp = &bp->fp[i];
 +			int new_idx = cos * (old_eth_num - delta) + i;
 +
 +			memcpy(&bp->bnx2x_txq[new_idx], fp->txdata_ptr[cos],
 +			       sizeof(struct bnx2x_fp_txdata));
 +			fp->txdata_ptr[cos] = &bp->bnx2x_txq[new_idx];
 +		}
 +	}
 +}
 +
++/**
+  * bnx2x_fill_fw_str - Fill buffer with FW version string.
+  *
+  * @bp:        driver handle
+  * @buf:       character buffer to fill with the fw name
+  * @buf_len:   length of the above buffer
+  *
+  */
+ void bnx2x_fill_fw_str(struct bnx2x *bp, char *buf, size_t buf_len)
+ {
+ 	if (IS_PF(bp)) {
+ 		u8 phy_fw_ver[PHY_FW_VER_LEN];
+ 
+ 		phy_fw_ver[0] = '\0';
+ 		bnx2x_get_ext_phy_fw_version(&bp->link_params,
+ 					     phy_fw_ver, PHY_FW_VER_LEN);
+ 		strlcpy(buf, bp->fw_ver, buf_len);
+ 		snprintf(buf + strlen(bp->fw_ver), 32 - strlen(bp->fw_ver),
+ 			 "bc %d.%d.%d%s%s",
+ 			 (bp->common.bc_ver & 0xff0000) >> 16,
+ 			 (bp->common.bc_ver & 0xff00) >> 8,
+ 			 (bp->common.bc_ver & 0xff),
+ 			 ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);
+ 	} else {
+ 		bnx2x_vf_fill_fw_str(bp, buf, buf_len);
+ 	}
+ }
+ 
  int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 */
  
  /* free skb in the packet ring at pos idx