diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 16:06:10 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 16:06:10 -0800 |
| commit | a5fcd228ca1db9810ba1ed461c90b6ee933b9daf (patch) | |
| tree | 814f208a81af8e90bff8619e2eed5d167b400dd2 /include/linux/fpga/fpga-mgr.h | |
| parent | 5a6fe61facdb7f830895712b31fb39f544ffc165 (diff) | |
| parent | 6980daaa3ed5959bf4fe2719d96b1da437026b58 (diff) | |
Merge branch 'for-6.3/cxl-rr-emu' into cxl/next
Pick up the CXL DVSEC range register emulation for v6.3, and resolve
conflicts with the cxl_port_probe() split (from for-6.3/cxl-ram-region)
and event handling (from for-6.3/cxl-events).
Diffstat (limited to 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions