summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 13:29:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-13 13:29:16 -0700
commit6adc19fd13f11883c44df67b551cf8201e6bba1d (patch)
tree455e80aca7b57b17069fab252261c4dcae44374d /fs/proc
parent3df83e164f1f39c614a3f31e39164756945ae2ea (diff)
parenta7f7f6248d9740d710fd6bd190293fe5e16410ac (diff)
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help' * tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
index 971a42f6357d..c930001056f9 100644
--- a/fs/proc/Kconfig
+++ b/fs/proc/Kconfig
@@ -66,7 +66,7 @@ config PROC_SYSCTL
depends on PROC_FS
select SYSCTL
default y
- ---help---
+ help
The sysctl interface provides a means of dynamically changing
certain kernel parameters and variables on the fly without requiring
a recompile of the kernel or reboot of the system. The primary