Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Mon, 30 Oct 2023 15:05:51 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dan Williams <dan.j.williams@intel.com>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Robert Richter <rrichter@amd.com>,
        Shiju Jose <shiju.jose@huawei.com>,
        Terry Bowman <terry.bowman@amd.com>
Subject: linux-next: manual merge of the cxl tree with the pm tree
Message-ID: <20231030150551.505a5d7b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/a2_o8911KH+Sdh/3qv=iuDC";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/a2_o8911KH+Sdh/3qv=iuDC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 m=
odule")

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.

--=20
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 t=
he
 +		 * ghes_estatus_pool to protect it from overwriting when multiple secti=
ons
 +		 * 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 =3D=3D AER_NONFATAL)
  			pcie_do_recovery(pdev, pci_channel_io_normal,
  					 aer_root_reset);

--Sig_/a2_o8911KH+Sdh/3qv=iuDC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU/K58ACgkQAVBC80lX
0GzZDQf/c60ja4vn7yQH/EyWpza6kzJalfqRvu8TlAgX87wqBZVYYa9oq7rcCBpT
zOV+WYj+1HKOte0mYizLnC9gQ4MXJcLJ9wXeR71RqV8tOdQeW1OP/cX+0Cu9A+Lh
UO60neTSzG4cACzdHEgQsi2puxl1PEr0thKxfgiEL4Q0D3NyXwHqdq83mZ6eHt6b
qD/XnjCiucvpaHQJACgOr36isZtPBmrioPxsogR5/43gU1Km1onc+sXG48Y0B5QJ
Df6PXmRMAcsleQZxnx675QrmBbARCFewXI9yi4nfNwJS3CKdlThFx69Dlj3kFwUi
BHCXmVFszfQHYZAIxfSD5EcRgRlQPQ==
=1A3M
-----END PGP SIGNATURE-----

--Sig_/a2_o8911KH+Sdh/3qv=iuDC--