Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[platform/kernel/linux-rpi.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 719871f..2c9cbd8 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -19,7 +19,7 @@ config CC_VERSION_TEXT
            CC_VERSION_TEXT so it is recorded in include/config/auto.conf.cmd.
            When the compiler is updated, Kconfig will be invoked.
 
-         - Ensure full rebuild when the compier is updated
+         - Ensure full rebuild when the compiler is updated
            include/linux/kconfig.h contains this option in the comment line so
            fixdep adds include/config/cc/version/text.h into the auto-generated
            dependency. When the compiler is updated, syncconfig will touch it
@@ -1709,6 +1709,7 @@ config BPF_SYSCALL
        select BPF
        select IRQ_WORK
        select TASKS_TRACE_RCU
+       select NET_SOCK_MSG if INET
        default n
        help
          Enable the bpf() system call that allows to manipulate eBPF
@@ -2283,7 +2284,6 @@ config TRIM_UNUSED_KSYMS
 config UNUSED_KSYMS_WHITELIST
        string "Whitelist of symbols to keep in ksymtab"
        depends on TRIM_UNUSED_KSYMS
-       default "scripts/lto-used-symbollist.txt" if LTO_CLANG
        help
          By default, all unused exported symbols will be un-exported from the
          build when TRIM_UNUSED_KSYMS is selected.