diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-08-04 17:05:16 -0600 |
| commit | 5f7b30cd766d3589a00750d6100f718347d8f495 (patch) | |
| tree | d97cb6934284dc98def18ae7daaa819acc2d50ed /Documentation/filesystems | |
| parent | c1ece76719205690f4b448460d9b85c130e8021b (diff) | |
| parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) | |
| download | lwn-docs-next-merge.tar.gz lwn-docs-next-merge.zip | |
Merge branch 'docs-next' into docs-next-mergedocs-next-merge
Fix the Makefile merge conflict.
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/tmpfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index d9c11d25bf02..a85355cf85f4 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt @@ -98,7 +98,7 @@ A memory policy with a valid NodeList will be saved, as specified, for use at file creation time. When a task allocates a file in the file system, the mount option memory policy will be applied with a NodeList, if any, modified by the calling task's cpuset constraints -[See Documentation/cgroups/cpusets.txt] and any optional flags, listed +[See Documentation/cgroup-v1/cpusets.txt] and any optional flags, listed below. If the resulting NodeLists is the empty set, the effective memory policy for the file will revert to "default" policy. |