linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

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
d9aee591b0f0 ("bnx2x: Don't release PCI bars on shutdown") from the net
tree and commit 33d8e6a5f555 ("bnx2x: Add AER support (missing bits)")
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@xxxxxxxxxxxxxxxx

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0067b975873f,cf17b660b4ee..000000000000
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -12942,26 -13082,27 +13082,28 @@@ static void __bnx2x_remove(struct pci_d
  		pci_set_power_state(pdev, PCI_D3hot);
  	}
  
+ 	bnx2x_disable_pcie_error_reporting(bp);
+ 
 -	if (bp->regview)
 -		iounmap(bp->regview);
 +	if (remove_netdev) {
 +		if (bp->regview)
 +			iounmap(bp->regview);
  
 -	/* for vf doorbells are part of the regview and were unmapped along with
 -	 * it. FW is only loaded by PF.
 -	 */
 -	if (IS_PF(bp)) {
 -		if (bp->doorbells)
 -			iounmap(bp->doorbells);
 +		/* For vfs, doorbells are part of the regview and were unmapped
 +		 * along with it. FW is only loaded by PF.
 +		 */
 +		if (IS_PF(bp)) {
 +			if (bp->doorbells)
 +				iounmap(bp->doorbells);
  
 -		bnx2x_release_firmware(bp);
 -	}
 -	bnx2x_free_mem_bp(bp);
 +			bnx2x_release_firmware(bp);
 +		}
 +		bnx2x_free_mem_bp(bp);
  
 -	if (remove_netdev)
  		free_netdev(dev);
  
 -	if (atomic_read(&pdev->enable_cnt) == 1)
 -		pci_release_regions(pdev);
 +		if (atomic_read(&pdev->enable_cnt) == 1)
 +			pci_release_regions(pdev);
 +	}
  
  	pci_disable_device(pdev);
  }

Attachment: pgp00000.pgp
Description: PGP signature