diff options
author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 10:59:02 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 11:00:58 +0300 |
commit | 24035886d735e4ce1c4605638adafe1fa2988e7a (patch) | |
tree | 8c75625bc848a16bde8ce69e902c70c28e7d3da7 /drivers/fpga/tests/fpga-bridge-test.c | |
parent | 3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90 (diff) | |
parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
download | linux-24035886d735e4ce1c4605638adafe1fa2988e7a.tar.xz |
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/fpga/tests/fpga-bridge-test.c')
-rw-r--r-- | drivers/fpga/tests/fpga-bridge-test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/fpga/tests/fpga-bridge-test.c b/drivers/fpga/tests/fpga-bridge-test.c index b9ab29809e96..124ba40e32b1 100644 --- a/drivers/fpga/tests/fpga-bridge-test.c +++ b/drivers/fpga/tests/fpga-bridge-test.c @@ -170,4 +170,5 @@ static struct kunit_suite fpga_bridge_suite = { kunit_test_suite(fpga_bridge_suite); +MODULE_DESCRIPTION("KUnit test for the FPGA Bridge"); MODULE_LICENSE("GPL"); |