]> git.itanic.dy.fi Git - linux-stable/commitdiff
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
authorDan Williams <dan.j.williams@intel.com>
Wed, 10 Jan 2024 03:21:44 +0000 (19:21 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 10 Jan 2024 03:21:44 +0000 (19:21 -0800)
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.

1  2 
drivers/cxl/core/mbox.c
drivers/cxl/cxlmem.h
include/linux/pci.h

Simple merge
index 1125d4f988e107e464d6ca40c11965935751ae36,3c201324a3b3e0c9e8cda6d726b0b05ae1ee0b13..5303d6942b880af65dcf8e77b02d26626c2bb94d
@@@ -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 */
Simple merge