Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 11 deletions

diff --git a/man5/tmpfs.5 b/man5/tmpfs.5
index 8e4d063..55fc826 100644
--- a/man5/tmpfs.5
+++ b/man5/tmpfs.5
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: Linux-man-pages-copyleft
 .\"
-.TH tmpfs 5 2023-07-28 "Linux man-pages 6.05.01"
+.TH tmpfs 5 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 tmpfs \- a virtual memory filesystem
 .SH DESCRIPTION
@@ -12,18 +12,18 @@ facility allows the creation of filesystems whose contents reside
 in virtual memory.
 Since the files on such filesystems typically reside in RAM,
 file access is extremely fast.
-.PP
+.P
 The filesystem is automatically created when mounting
 a filesystem with the type
 .B tmpfs
 via a command such as the following:
-.PP
+.P
 .in +4n
 .EX
 $ sudo mount \-t tmpfs \-o size=10M tmpfs /mnt/mytmpfs
 .EE
 .in
-.PP
+.P
 A
 .B tmpfs
 filesystem has the following properties:
@@ -38,7 +38,7 @@ During a remount operation
 .RI ( "mount\ \-o\ remount" ),
 the filesystem size can be changed
 (without losing the existing contents of the filesystem).
-.PP
+.P
 If a
 .B tmpfs
 filesystem is unmounted, its contents are discarded (lost).
@@ -51,6 +51,8 @@ filesystem supports the following mount options:
 .BR size "=\fIbytes\fP"
 Specify an upper limit on the size of the filesystem.
 The size is given in bytes, and rounded up to entire pages.
+The limit is removed if the size is
+.BR 0 .
 .IP
 The size may have a
 .BR k ,
@@ -89,6 +91,8 @@ but not a % suffix.
 The maximum number of inodes for this instance.
 The default is half of the number of your physical RAM pages, or (on a
 machine with highmem) the number of lowmem RAM pages, whichever is smaller.
+The limit is removed if the number is
+.BR 0 .
 .IP
 Inodes may be specified with
 .BR k ,
@@ -99,6 +103,12 @@ suffixes like
 .BR size ,
 but not a % suffix.
 .TP
+.BR noswap "(since Linux 6.4)"
+.\" commit 2c6efe9cf2d7841b75fe38ed1adbd41a90f51ba0
+Disables swap.
+Remounts must respect the original settings.
+By default swap is enabled.
+.TP
 .BR mode "=\fImode\fP"
 Set initial permissions of the root directory.
 .TP
@@ -208,7 +218,7 @@ In order for user-space tools and applications to create
 filesystems, the kernel must be configured with the
 .B CONFIG_TMPFS
 option.
-.PP
+.P
 The
 .B tmpfs
 filesystem supports extended attributes (see
@@ -216,7 +226,7 @@ filesystem supports extended attributes (see
 but
 .I user
 extended attributes are not permitted.
-.PP
+.P
 An internal shared memory filesystem is used for
 System V shared memory
 .RB ( shmget (2))
@@ -231,7 +241,7 @@ This filesystem is available regardless of whether
 the kernel was configured with the
 .B CONFIG_TMPFS
 option.
-.PP
+.P
 A
 .B tmpfs
 filesystem mounted at
@@ -240,7 +250,7 @@ is used for the implementation of POSIX shared memory
 .RB ( shm_overview (7))
 and POSIX semaphores
 .RB ( sem_overview (7)).
-.PP
+.P
 The amount of memory consumed by all
 .B tmpfs
 filesystems is shown in the
@@ -251,7 +261,7 @@ and in the
 .I shared
 field displayed by
 .BR free (1).
-.PP
+.P
 The
 .B tmpfs
 facility was formerly called
@@ -264,7 +274,7 @@ facility was formerly called
 .BR set_mempolicy (2),
 .BR shm_open (3),
 .BR mount (8)
-.PP
+.P
 The kernel source files
 .I Documentation/filesystems/tmpfs.txt
 and