diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-06-29 12:15:51 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-06-29 12:16:26 +0200 |
| commit | 60e9eabf41fa916d2ef68c5bf929197975917578 (patch) | |
| tree | 39ce456390ed34d2624aed1260203f43fff94d38 /fs/Kconfig | |
| parent | 84e543bc9d1dc550132ba25b72df28d40cc44333 (diff) | |
| parent | 0a19b068acc47d05212f03e494381926dc0381e2 (diff) | |
| download | linux-60e9eabf41fa916d2ef68c5bf929197975917578.tar.bz2 | |
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index f08fbbfafd9a..a88aa3af73c1 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -166,7 +166,7 @@ config TMPFS space. If you unmount a tmpfs instance, everything stored therein is lost. - See <file:Documentation/filesystems/tmpfs.txt> for details. + See <file:Documentation/filesystems/tmpfs.rst> for details. config TMPFS_POSIX_ACL bool "Tmpfs POSIX Access Control Lists" @@ -229,7 +229,7 @@ endmenu menuconfig MISC_FILESYSTEMS bool "Miscellaneous filesystems" default y - ---help--- + help Say Y here to get to see options for various miscellaneous filesystems, such as filesystems that came from other operating systems. @@ -274,7 +274,7 @@ menuconfig NETWORK_FILESYSTEMS bool "Network File Systems" default y depends on NET - ---help--- + help Say Y here to get to see options for network filesystems and filesystem-related networking code, such as NFS daemon and RPCSEC security modules. |