* FYI, cxl.git vs acpi.git conflict entering linux-next (for-6.8/cxl-cper)
@ 2024-01-10 4:30 Dan Williams
0 siblings, 0 replies; only message in thread
From: Dan Williams @ 2024-01-10 4:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: xueshuai, linux-next, Rafael J. Wysocki, Dave Jiang, linux-acpi,
linux-cxl, ira.weiny
The final topic branch I want to merge for v6.8 contains a conflict with
acpi.git commit:
a70297d22132 ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events
...here is my resolution:
diff --cc drivers/acpi/apei/ghes.c
index ab2a82cb1b0b,56a5d2ef9e0a..7b7c605166e0
--- 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);
No other feature additions are pending for this cycle. Given this topic's
readiness and testing I saw no immediate reason to hold this off until v6.9,
but yes I wish it would have settled a bit earlier.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-10 4:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-10 4:30 FYI, cxl.git vs acpi.git conflict entering linux-next (for-6.8/cxl-cper) Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).