diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2025-05-13 08:12:44 +0300 | 
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2025-05-13 08:12:44 +0300 | 
| commit | 15ff5d0e90bb044b94d9a4ac57276829861a954d (patch) | |
| tree | 28bcf60949db629b0b772f6eebf026714dc38fe9 /drivers/fpga/tests/fpga-region-test.c | |
| parent | a0372b3831785e15de605cd13d2ed78a79a9b435 (diff) | |
| parent | 7c3f259dfe03f5dcd898126602818a8fbe94d3c5 (diff) | |
| download | linux-15ff5d0e90bb044b94d9a4ac57276829861a954d.tar.xz | |
Merge branch 'for-6.16/tsm-mr' into tsm-next
Merge measurement-register infrastructure for v6.16. Resolve conflicts
with the establishment of drivers/virt/coco/guest/ for cross-vendor
common TSM functionality.
Address a mis-merge with a fixup from Lukas:
Link: http://lore.kernel.org/20250509134031.70559-1-lukas.bulwahn@redhat.com
Diffstat (limited to 'drivers/fpga/tests/fpga-region-test.c')
| -rw-r--r-- | drivers/fpga/tests/fpga-region-test.c | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/fpga/tests/fpga-region-test.c b/drivers/fpga/tests/fpga-region-test.c index 6a108cafded8..020ceac48509 100644 --- a/drivers/fpga/tests/fpga-region-test.c +++ b/drivers/fpga/tests/fpga-region-test.c @@ -214,4 +214,5 @@ static struct kunit_suite fpga_region_suite = {  kunit_test_suite(fpga_region_suite); +MODULE_DESCRIPTION("KUnit test for the FPGA Region");  MODULE_LICENSE("GPL");  | 
