Masahiro Yamada e55dad12ab bpf: Merge two CONFIG_BPF entries ... 'config BPF' exists in both init/Kconfig and kernel/bpf/Kconfig. Commit b24abcff91 ("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: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Yonghong Song <yonghong.song@linux.dev> Link: https://lore.kernel.org/bpf/20240204075634.32969-1-masahiroy@kernel.org		2024-02-07 16:38:20 -08:00
..
.gitignore	kbuild: build init/built-in.a just once	2022-09-29 04:40:15 +09:00
build-version	kbuild: build init/built-in.a just once	2022-09-29 04:40:15 +09:00
calibrate.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
do_mounts_initrd.c	init: pass root_device_name explicitly	2023-06-05 10:55:20 -06:00
do_mounts_rd.c	init: add an init_unlink helper	2020-07-31 08:17:52 +02:00
do_mounts.c	rootfs: Fix support for rootfstype= when root= is given	2023-12-07 10:29:21 +09:00
do_mounts.h	init: pass root_device_name explicitly	2023-06-05 10:55:20 -06:00
init_task.c	header cleanups for 6.8	2024-01-10 16:43:55 -08:00
initramfs.c	initramfs: Expose retained initrd as sysfs file	2023-12-15 17:23:00 +01:00
Kconfig	bpf: Merge two CONFIG_BPF entries	2024-02-07 16:38:20 -08:00
main.c	proc: sysctl: prevent aliased sysctls from getting passed to init	2023-11-01 12:10:02 -07:00
Makefile	x86/retpoline: Make sure there are no unconverted return thunks due to KCSAN	2023-10-20 13:02:23 +02:00
noinitramfs.c	init: move usermodehelper_enable() to populate_rootfs()	2021-09-08 11:50:27 -07:00
version-timestamp.c	init/version-timestamp.c: remove unneeded #include <linux/version.h>	2023-01-09 07:34:38 +09:00
version.c	init/version.c: Replace strlcpy with strscpy	2023-09-22 09:50:56 -07:00