This is a note to let you know that I've just added the patch titled kunit: fix kunit_test_init_section_suites(...) to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: kunit-fix-kunit_test_init_section_suites.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 630cbbd98b333d40992cc21a1916e9437fd8a296 Author: Brendan Higgins <brendan.higgins@xxxxxxxxx> Date: Tue Jan 31 10:35:03 2023 +0800 kunit: fix kunit_test_init_section_suites(...) [ Upstream commit 254c71374a70051a043676b67ba4f7ad392b5fe6 ] Looks like kunit_test_init_section_suites(...) was messed up in a merge conflict. This fixes it. kunit_test_init_section_suites(...) was not updated to avoid the extra level of indirection when .kunit_test_suites was flattened. Given no-one was actively using it, this went unnoticed for a long period of time. Fixes: e5857d396f35 ("kunit: flatten kunit_suite*** to kunit_suite** in .kunit_test_suites") Signed-off-by: Brendan Higgins <brendan.higgins@xxxxxxxxx> Signed-off-by: David Gow <davidgow@xxxxxxxxxx> Tested-by: Martin Fernandez <martin.fernandez@xxxxxxxxxxxxx> Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/include/kunit/test.h b/include/kunit/test.h index b1ab6b32216d..ebcdbddf8344 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -299,7 +299,6 @@ static inline int kunit_run_all_tests(void) */ #define kunit_test_init_section_suites(__suites...) \ __kunit_test_suites(CONCATENATE(__UNIQUE_ID(array), _probe), \ - CONCATENATE(__UNIQUE_ID(suites), _probe), \ ##__suites) #define kunit_test_init_section_suite(suite) \