Received-SPF: pass (google.com: domain of linux-kernel+bounces-22970-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 11 Jan 2024 13:23:55 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>, 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>, Shuai Xue <xueshuai@linux.alibaba.com>
Subject: linux-next: manual merge of the cxl tree with Linus' tree
Message-ID: <20240111132355.66a1240c@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/F8w1+gnMp5lJtZdPlIm1pv6";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/F8w1+gnMp5lJtZdPlIm1pv6
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/acpi/apei/ghes.c

between commit:

  a70297d22132 ("ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED=
 on synchronous events")

from Linus' tree and commit:

  671a794c33c6 ("acpi/ghes: Process CXL Component Events")

from the cxl tree.

Thanks for the heads up, Dan.

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/acpi/apei/ghes.c
index ab2a82cb1b0b,56a5d2ef9e0a..000000000000
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@@ -706,7 -762,23 +779,23 @@@ static bool ghes_do_proc(struct ghes *g
  			ghes_handle_aer(gdata);
  		}
  		else if (guid_equal(sec_type, &CPER_SEC_PROC_ARM)) {
 -			queued =3D ghes_handle_arm_hw_error(gdata, sev);
 +			queued =3D ghes_handle_arm_hw_error(gdata, sev, sync);
+ 		} else if (guid_equal(sec_type, &CPER_SEC_CXL_GEN_MEDIA_GUID)) {
+ 			struct cxl_cper_event_rec *rec =3D
+ 				acpi_hest_get_payload(gdata);
+=20
+ 			cxl_cper_post_event(CXL_CPER_EVENT_GEN_MEDIA, rec);
+ 		} else if (guid_equal(sec_type, &CPER_SEC_CXL_DRAM_GUID)) {
+ 			struct cxl_cper_event_rec *rec =3D
+ 				acpi_hest_get_payload(gdata);
+=20
+ 			cxl_cper_post_event(CXL_CPER_EVENT_DRAM, rec);
+ 		} else if (guid_equal(sec_type,
+ 				      &CPER_SEC_CXL_MEM_MODULE_GUID)) {
+ 			struct cxl_cper_event_rec *rec =3D
+ 				acpi_hest_get_payload(gdata);
+=20
+ 			cxl_cper_post_event(CXL_CPER_EVENT_MEM_MODULE, rec);
  		} else {
  			void *err =3D acpi_hest_get_payload(gdata);
 =20

--Sig_/F8w1+gnMp5lJtZdPlIm1pv6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWfUTsACgkQAVBC80lX
0GwEYwf+KAPPTMtMbemBGwQgI8S4t9PlweH6cbxfkEr0imzTpff4KdGWvjgy3ADu
yd3fXkSI9FsaPDyBhOp0hvErnHsxRlPBafcaYqz6a5MkXnslFt2l8CgMsgEx/Ghp
/qZ5jtcwFs7RpGjMmCUvNAVT1s42E8tyX25/NPmvyXaqJO/cYu94a0/EwQXdiNTC
xIxn7lfY8KLuuVF23dB8twWQEKLxbBbW3XUs4rQEg/spBRjFuQ2JIZzLEiTLFFqV
b7pOtrBLqMzZqfZ7ej6ZT96E0R062fMw3SgAyZ736ZyjCKTzJuRT0DmnUyrGWeWX
m3mgbGi1Ji3FXmm1iKNPSaCBRgT8qg==
=YMTH
-----END PGP SIGNATURE-----

--Sig_/F8w1+gnMp5lJtZdPlIm1pv6--