linux-next: manual merge of the cxl tree with the pm tree

[Stephen Rothwell]

Hi all,

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

  drivers/pci/pcie/aer.c

between commit:

  e2abc47a5a1a ("ACPI: APEI: Fix AER info corruption when error status data has multiple sections")

from the pm tree and commit:

  6777877eb7a3 ("PCI/AER: Refactor cper_print_aer() for use by CXL driver module")

from the cxl 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/pci/pcie/aer.c
index dcd35993004e,36541bfab688..000000000000
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@@ -997,16 -1137,7 +1138,16 @@@ static void aer_recover_work_func(struc
  			       PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn));
  			continue;
  		}
- 		cper_print_aer(pdev, entry.severity, entry.regs);
+ 		pci_print_aer(pdev, entry.severity, entry.regs);
 +		/*
 +		 * Memory for aer_capability_regs(entry.regs) is being allocated from the
 +		 * ghes_estatus_pool to protect it from overwriting when multiple sections
 +		 * are present in the error status. Thus free the same after processing
 +		 * the data.
 +		 */
 +		ghes_estatus_pool_region_free((unsigned long)entry.regs,
 +					      sizeof(struct aer_capability_regs));
 +
  		if (entry.severity == AER_NONFATAL)
  			pcie_do_recovery(pdev, pci_channel_io_normal,
  					 aer_root_reset);

Attachment: pgp9SSUq5GsqV.pgp
Description: OpenPGP digital signature