diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-06-03 00:38:14 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-06-19 13:57:20 -0600 |
| commit | d5ddc6d98d48216ea7d829c06e8a8d7509f1765a (patch) | |
| tree | 32168ca68f0e00cd6261da47efbd1e70245a27af | |
| parent | 2253bd848017098b7729e159cb533e43e87cc154 (diff) | |
docs: fs: proc.rst: fix a warning due to a merge conflict
Changeset 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps")
added a new parameter to a table. This causes Sphinx warnings,
because there's now an extra "-" at the wrong place:
/devel/v4l/docs/Documentation/filesystems/proc.rst:548: WARNING: Malformed table.
Text in column margin in table line 29.
== =======================================
rd readable
...
bt - arm64 BTI guarded page
== =======================================
Fixes: 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps")
Fixes: c33e97efa9d9 ("docs: filesystems: convert proc.txt to ReST")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/28c4f4c5c66c0fd7cbce83fe11963ea6154f1d47.1591137229.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| -rw-r--r-- | Documentation/filesystems/proc.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 996f3cfe7030..53a0230a08e2 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -545,7 +545,7 @@ encoded manner. The codes are the following: hg huge page advise flag nh no huge page advise flag mg mergable advise flag - bt - arm64 BTI guarded page + bt arm64 BTI guarded page == ======================================= Note that there is no guarantee that every flag and associated mnemonic will |