]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2dffd6e373e36716f3bc3076c1c3a933c80fb8fc
tree32168ca68f0e00cd6261da47efbd1e70245a27af
parent3b1e76a5633646e574472682f2466ed11aceef28
docs: fs: proc.rst: fix a warning due to a merge conflict

Changeset 0d14076c93ea ("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: 0d14076c93ea ("mm: smaps: Report arm64 guarded pages in smaps")
Fixes: 1e7470c34131 ("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