From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 27 Mar 2025 18:14:43 +0000 (-0500)
Subject: Merge branch 'pci/doe'
X-Git-Tag: block-6.15-20250403~40^2~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=651aa9052c35287fd0bf280ba847b3de051f20f5;p=linux-block.git

Merge branch 'pci/doe'

- Rename DOE 'protocol' to 'feature' to follow spec terminology (Alistair
  Francis)

- Expose supported DOE features via sysfs (Alistair Francis)

- Allow DOE support to be enabled even if CXL isn't enabled (Alistair
  Francis)

* pci/doe:
  PCI/DOE: Allow enabling DOE without CXL
  PCI/DOE: Expose DOE features via sysfs
  PCI/DOE: Rename Discovery Response Data Object Contents to type
  PCI/DOE: Rename DOE protocol to feature
---

651aa9052c35287fd0bf280ba847b3de051f20f5