docs: fs: proc.rst: fix a warning due to a merge conflict
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 2 Jun 2020 22:38:14 +0000 (00:38 +0200)
committerJonathan Corbet <corbet@lwn.net>
Fri, 19 Jun 2020 19:57:20 +0000 (13:57 -0600)
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>
Documentation/filesystems/proc.rst

index 996f3cfe7030ab48c05c6abdde457b8301d65ab0..53a0230a08e2320a1dd4751cb1625e8abbf011ae 100644 (file)
@@ -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