| Message ID | 83371a8c-9f40-3947-51d0-07efc15bdae2@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6234806f8c9fe93f8db99cb47fc079ce78aabbd5 |
| Headers | show |
| Series | [GIT,PULL] KUnit fixes update for Linux 6.0-rc3 | expand |
The pull request you sent on Mon, 22 Aug 2022 16:08:31 -0600:
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-fixes-6.0-rc3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6234806f8c9fe93f8db99cb47fc079ce78aabbd5
Thank you!
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 10c563999d3d..e63608834411 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -171,6 +171,7 @@ config MMC_SDHCI_OF_ASPEED config MMC_SDHCI_OF_ASPEED_TEST bool "Tests for the ASPEED SDHCI driver" if !KUNIT_ALL_TESTS depends on MMC_SDHCI_OF_ASPEED && KUNIT + depends on (MMC_SDHCI_OF_ASPEED=m || KUNIT=y) default KUNIT_ALL_TESTS help Enable KUnit tests for the ASPEED SDHCI driver. Select this diff --git a/kernel/module/main.c b/kernel/module/main.c index 6a477c622544..a4e4d84b6f4e 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2099,7 +2099,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) sizeof(*mod->static_call_sites), &mod->num_static_call_sites); #endif -#ifdef CONFIG_KUNIT +#if IS_ENABLED(CONFIG_KUNIT) mod->kunit_suites = section_objs(info, ".kunit_test_suites", sizeof(*mod->kunit_suites), &mod->num_kunit_suites);
Hi Linus, Please pull the following KUnit fixes update for Linux 6.0-rc3. This KUnit fixes update for Linux 6.0-rc3 consists of fixes to mmc test and fix to load .kunit_test_suites section when CONFIG_KUNIT=m, and not just when KUnit is built-in. Please note that this KUnit update touches mmc driver Kconfig and kernel/module/main.c. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 568035b01cfb107af8d2e4bd2fb9aea22cf5b868: Linux 6.0-rc1 (2022-08-14 15:50:18 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-fixes-6.0-rc3 for you to fetch changes up to 41a55567b9e31cb852670684404654ec4fd0d8d6: module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m (2022-08-15 13:51:07 -0600) ---------------------------------------------------------------- linux-kselftest-kunit-fixes-6.0-rc3 This KUnit fixes update for Linux 6.0-rc3 consists of fixes to mmc test and fix to load .kunit_test_suites section when CONFIG_KUNIT=m, and not just when KUnit is built-in. ---------------------------------------------------------------- David Gow (2): mmc: sdhci-of-aspeed: test: Fix dependencies when KUNIT=m module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m drivers/mmc/host/Kconfig | 1 + kernel/module/main.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------