diff options
| author | Björn Töpel <bjorn@rivosinc.com> | 2023-10-04 15:48:36 +0300 |
|---|---|---|
| committer | Shuah Khan <skhan@linuxfoundation.org> | 2023-10-05 23:23:15 +0300 |
| commit | 6d3d638d1865a6e34787c6e20eee1c6d8d32fd40 (patch) | |
| tree | 41435232a070565375f16af0dc23240d568e23f4 /drivers/clk | |
| parent | 876d7fcd1f4c7475b79fc3b923058f5ac7524646 (diff) | |
| download | linux-6d3d638d1865a6e34787c6e20eee1c6d8d32fd40.tar.xz | |
kbuild: Let builtin have precedence over modules for kselftest-merge
The kselftest-merge target walks all kselftests configs, and merges
them. However, builtin does not have precedence over modules. This
breaks some of the tests, e.g.:
$ grep CONFIG_NF_NAT tools/testing/selftests/{bpf,net}/config
tools/testing/selftests/bpf/config:CONFIG_NF_NAT=y
tools/testing/selftests/net/config:CONFIG_NF_NAT=m
Here, the net config will set NF_NAT to module, which makes it clunky
to run the BPF tests.
Add '-y' to scripts/kconfig/merge_config.sh.
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'drivers/clk')
0 files changed, 0 insertions, 0 deletions