linux-next: manual merge of the pci tree with the pci-current tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2571 bytes --]

Hi all,

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

  drivers/pci/pcie/aer.c

between commit:

  79c168e2aa957 ("PCI/AER: Skip error recovery on false alarms")

from the pci-current tree and commit:

  d4c842c3af5bc ("PCI/AER: Fix memory leak in aer_recover_work_func() when pci_dev is missing")

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.

diff --cc drivers/pci/pcie/aer.c
index 922a726a52a50,c376c3adbefd2..0000000000000
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@@ -1373,16 -1370,9 +1372,15 @@@ static void aer_recover_work_func(struc
  					   entry.domain, entry.bus,
  					   PCI_SLOT(entry.devfn),
  					   PCI_FUNC(entry.devfn));
- 			continue;
- 		}
- 		pci_print_aer(pdev, entry.severity, entry.regs);
+ 		else
+ 			pci_print_aer(pdev, entry.severity, entry.regs);
  
 +		regs = entry.regs;
 +		if (entry.severity == AER_CORRECTABLE)
 +			err = regs->cor_status & ~regs->cor_mask;
 +		else
 +			err = regs->uncor_status & ~regs->uncor_mask;
 +
  		/*
  		 * Memory for aer_capability_regs(entry.regs) is being
  		 * allocated from the ghes_estatus_pool to protect it from
@@@ -1393,15 -1383,15 +1391,21 @@@
  		ghes_estatus_pool_region_free((unsigned long)entry.regs,
  					    sizeof(struct aer_capability_regs));
  
- 		if (err) {
- 			if (entry.severity == AER_NONFATAL)
- 				pcie_do_recovery(pdev, pci_channel_io_normal,
- 						 aer_root_reset);
- 			else if (entry.severity == AER_FATAL)
- 				pcie_do_recovery(pdev, pci_channel_io_frozen,
- 						 aer_root_reset);
+ 		if (pdev) {
 -			if (entry.severity == AER_NONFATAL)
 -				pcie_do_recovery(pdev, pci_channel_io_normal,
 -						 aer_root_reset);
 -			else if (entry.severity == AER_FATAL)
 -				pcie_do_recovery(pdev, pci_channel_io_frozen,
 -						 aer_root_reset);
++			if (err) {
++				if (entry.severity == AER_NONFATAL)
++					pcie_do_recovery(pdev,
++							 pci_channel_io_normal,
++							 aer_root_reset);
++				else if (entry.severity == AER_FATAL)
++					pcie_do_recovery(pdev,
++							 pci_channel_io_frozen,
++							 aer_root_reset);
++				}
++			}
++
+ 			pci_dev_put(pdev);
  		}
- 		pci_dev_put(pdev);
  	}
  }
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]