]> git.itanic.dy.fi Git - linux-stable/commitdiff
Merge branch 'for-6.7/cxl-qtg' into cxl/next
authorDan Williams <dan.j.williams@intel.com>
Tue, 31 Oct 2023 17:59:26 +0000 (10:59 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 31 Oct 2023 17:59:26 +0000 (10:59 -0700)
Merge some prep-work for CXL QOS class support. This cycle saw large
collisions with mm on this topic, so the bulk of this topic needs to
wait.

1  2 
drivers/cxl/core/pci.c
drivers/cxl/core/port.c
drivers/cxl/cxl.h

Simple merge
Simple merge
Simple merge