summaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2020-06-16 13:31:47 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2020-06-16 13:31:47 +0200
commit4b3c1f1b15f576445c221cbc77a88540433a2ba7 (patch)
treeb88ac114c16fa1747205c9060bf00498bcb5df97 /net/unix
parent11425c4519e2c974a100fc984867046d905b9380 (diff)
parentb3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff)
Merge v5.8-rc1 into drm-misc-fixes
Beginning a new release cycles for what will become v5.8. Updating drm-misc-fixes accordingly. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/Kconfig b/net/unix/Kconfig
index a23a5cca97532..b6c4282899ec3 100644
--- a/net/unix/Kconfig
+++ b/net/unix/Kconfig
@@ -5,7 +5,7 @@
config UNIX
tristate "Unix domain sockets"
- ---help---
+ help
If you say Y here, you will include support for Unix domain sockets;
sockets are the standard Unix mechanism for establishing and
accessing network connections. Many commonly used programs such as
@@ -29,6 +29,6 @@ config UNIX_DIAG
tristate "UNIX: socket monitoring interface"
depends on UNIX
default n
- ---help---
+ help
Support for UNIX socket monitoring interface used by the ss tool.
If unsure, say Y.