From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 10 Jan 2024 03:21:44 +0000 (-0800)
Subject: Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3601311593eb44d34f142b993cb6f38f9a7863b3;p=linux.git

Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl

Pick up the CPER to CXL driver integration work for v6.8. Some
additional cleanup of cper_estatus_print() messages is needed, but that
is to be handled incrementally.
---

3601311593eb44d34f142b993cb6f38f9a7863b3
diff --cc drivers/cxl/cxlmem.h
index 1125d4f988e10,3c201324a3b3e..5303d6942b880
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@@ -6,7 -6,7 +6,8 @@@
  #include <linux/cdev.h>
  #include <linux/uuid.h>
  #include <linux/rcuwait.h>
+ #include <linux/cxl-event.h>
 +#include <linux/node.h>
  #include "cxl.h"
  
  /* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */