property entry kunit tests are built if CONFIG_KUNIT_DRIVER_PE_TEST (a boolean) is 'y'; it in turn depends on CONFIG_KUNIT. However to ensure clean merge with linux-next, where CONFIG_KUNIT is tristate, we need to explicitly specify KUNIT=y as a dependency, otherwise allmodconfig builds will build kunit as a module and fail to build the property entry tests. Later CONFIG_KUNIT_DRIVER_PE_TEST can be converted to tristate. Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Fixes: 27f9d7e984d9 ("software node: introduce CONFIG_KUNIT_DRIVER_PE_TEST") Signed-off-by: Alan Maguire <alan.maguire@xxxxxxxxxx> --- drivers/base/test/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/test/Kconfig b/drivers/base/test/Kconfig index d29ae95..305c775 100644 --- a/drivers/base/test/Kconfig +++ b/drivers/base/test/Kconfig @@ -10,4 +10,4 @@ config TEST_ASYNC_DRIVER_PROBE If unsure say N. config KUNIT_DRIVER_PE_TEST bool "KUnit Tests for property entry API" - depends on KUNIT + depends on KUNIT=y -- 1.8.3.1