diff options
| author | Dan Williams <[email protected]> | 2022-12-05 12:30:38 -0800 |
|---|---|---|
| committer | Dan Williams <[email protected]> | 2022-12-05 12:30:38 -0800 |
| commit | 95dddcb5e86381abddeb1ccab5b5826fdcc74c70 (patch) | |
| tree | b436da563bba57da1d1178ba8cd0bfbd1d9c2e0b /drivers/fpga/fpga-mgr.c | |
| parent | da8380bbbe90f69bec4be69af4d0deb7cf2bbcfe (diff) | |
| parent | d18bc74aced65e4ad68a30ac8db883398141e918 (diff) | |
Merge branch 'for-6.2/cxl-security' into for-6.2/cxl
Pick CXL PMEM security commands for v6.2. Resolve conflicts with the
removal of the cxl_pmem_wq.
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions