* linux-next: manual merge of the cxl tree with Linus' tree
@ 2024-01-11 2:23 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-01-11 2:23 UTC (permalink / raw)
To: Dan Williams
Cc: Ira Weiny, Linux Kernel Mailing List, Linux Next Mailing List,
Rafael J. Wysocki, Shuai Xue
[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]
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.
--
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 = ghes_handle_arm_hw_error(gdata, sev);
+ queued = 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 =
+ acpi_hest_get_payload(gdata);
+
+ 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 =
+ acpi_hest_get_payload(gdata);
+
+ 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 =
+ acpi_hest_get_payload(gdata);
+
+ cxl_cper_post_event(CXL_CPER_EVENT_MEM_MODULE, rec);
} else {
void *err = acpi_hest_get_payload(gdata);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-11 2:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-11 2:23 linux-next: manual merge of the cxl tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox