Commit e55dad12 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Andrii Nakryiko
Browse files

bpf: Merge two CONFIG_BPF entries



'config BPF' exists in both init/Kconfig and kernel/bpf/Kconfig.

Commit b24abcff ("bpf, kconfig: Add consolidated menu entry for bpf
with core options") added the second one to kernel/bpf/Kconfig instead
of moving the existing one.

Merge them together.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20240204075634.32969-1-masahiroy@kernel.org
parent ba6a6abb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment