Messages in this thread Patch in this message | | | From | Mauro Carvalho Chehab <> | Subject | [PATCH 2/2] docs: fs: proc.rst: fix a warning due to a merge conflict | Date | Wed, 3 Jun 2020 00:38:14 +0200 |
| |
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> --- Documentation/filesystems/proc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 430963e0e8c3..7359741cf7cf 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -543,7 +543,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 -- 2.26.2
| |