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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 31 Mar 2020 10:49:47 +1100

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/net/ethernet/intel/ice/ice_main.c

between commit:

  19cce2c6f6dc ("ice: Make print statements more compact")

from Linus' tree and commit:

  894020fdd88c ("PCI/AER: Rationalize error status register clearing")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
index 5ef28052c0f8,effca3fa92e0..000000000000
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@@ -3458,9 -3495,10 +3458,9 @@@ static pci_ers_result_t ice_pci_err_slo
  			result = PCI_ERS_RESULT_DISCONNECT;
  	}
  
- 	err = pci_cleanup_aer_uncorrect_error_status(pdev);
+ 	err = pci_aer_clear_nonfatal_status(pdev);
  	if (err)
- 		dev_dbg(&pdev->dev, "pci_cleanup_aer_uncorrect_error_status failed, error %d\n",
 -		dev_dbg(&pdev->dev,
 -			"pci_aer_clear_nonfatal_status() failed, error %d\n",
++		dev_dbg(&pdev->dev, "pci_aer_clear_nonfatal_status() failed, error %d\n",
  			err);
  		/* non-fatal, continue */