FYI, cxl.git vs acpi.git conflict entering linux-next (for-6.8/cxl-cper)

Commit Message

Dan Williams Jan. 10, 2024, 4:30 a.m. UTC

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:

+++ 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.

Patch

diff --cc drivers/acpi/apei/ghes.c
index ab2a82cb1b0b,56a5d2ef9e0a..7b7c605166e0
--- a/drivers/acpi/apei/ghes.c