All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	linux-kernel@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Kees Cook <keescook@chromium.org>,
	Daniel Kiss <daniel.kiss@arm.com>,
	Mark Brown <broonie@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	linux-fsdevel@vger.kernel.org
Subject: [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge conflict
Date: Mon, 15 Jun 2020 08:47:07 +0200	[thread overview]
Message-ID: <7d46aec2cb7a5328d260c7c815b9be9737b43ee1.1592203542.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1592203542.git.mchehab+huawei@kernel.org>

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 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
-- 
2.26.2


  parent reply	other threads:[~2020-06-15  6:47 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-15  6:46 [PATCH 00/29] Documentation fixes Mauro Carvalho Chehab
2020-06-15  6:46 ` Mauro Carvalho Chehab
2020-06-15  6:46 ` Mauro Carvalho Chehab
2020-06-15  6:46 ` Mauro Carvalho Chehab
2020-06-15  6:46 ` Mauro Carvalho Chehab
2020-06-15  6:46 ` [f2fs-dev] " Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 01/29] mm: vmalloc.c: remove a kernel-doc annotation from a removed parameter Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 02/29] net: dev: add a missing kernel-doc annotation Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 03/29] net: netdevice.h: add a description for napi_defer_hard_irqs Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 04/29] scripts/kernel-doc: parse __ETHTOOL_DECLARE_LINK_MODE_MASK Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 05/29] net: pylink.h: add kernel-doc descriptions for new fields at phylink_config Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 06/29] scripts/kernel-doc: handle function pointer prototypes Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 07/29] fs: fs.h: fix a kernel-doc parameter description Mauro Carvalho Chehab
2020-06-15  8:47   ` Jan Kara
2020-06-15  6:46 ` [PATCH 08/29] gpio: driver.h: fix kernel-doc markup Mauro Carvalho Chehab
2020-06-15  8:05   ` Bartosz Golaszewski
2020-06-15  6:46 ` [PATCH 09/29] kcsan: fix a kernel-doc warning Mauro Carvalho Chehab
2020-06-15  6:56   ` Marco Elver
2020-06-15  6:46 ` [PATCH 10/29] rcu: fix some kernel-doc warnings Mauro Carvalho Chehab
2020-06-15 20:36   ` Paul E. McKenney
2020-06-15  6:46 ` [PATCH 11/29] fs: docs: f2fs.rst: fix a broken table Mauro Carvalho Chehab
2020-06-15  6:46   ` [f2fs-dev] " Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 12/29] dt: update a reference for reneases pcar file renamed to yaml Mauro Carvalho Chehab
2020-06-15  7:38   ` Geert Uytterhoeven
2020-06-18 16:41   ` Rob Herring
2020-06-15  6:46 ` [PATCH 13/29] dt: fix broken links due to txt->yaml renames Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  8:13   ` Thomas Bogendoerfer
2020-06-15  8:13     ` Thomas Bogendoerfer
2020-06-15  8:13     ` Thomas Bogendoerfer
2020-06-15  8:13     ` Thomas Bogendoerfer
2020-06-15  8:13     ` Thomas Bogendoerfer
2020-06-15  8:13     ` Thomas Bogendoerfer
2020-06-15 11:19   ` Mark Brown
2020-06-15 11:19     ` Mark Brown
2020-06-15 11:19     ` Mark Brown
2020-06-15 11:19     ` Mark Brown
2020-06-15 11:19     ` Mark Brown
2020-06-15 11:19     ` Mark Brown
2020-06-15 11:57     ` Mauro Carvalho Chehab
2020-06-15 11:57       ` Mauro Carvalho Chehab
2020-06-15 11:57       ` Mauro Carvalho Chehab
2020-06-15 11:57       ` Mauro Carvalho Chehab
2020-06-15 11:57       ` Mauro Carvalho Chehab
2020-06-15 11:57       ` Mauro Carvalho Chehab
2020-06-15 12:01       ` Mark Brown
2020-06-15 12:01         ` Mark Brown
2020-06-15 12:01         ` Mark Brown
2020-06-15 12:01         ` Mark Brown
2020-06-15 12:01         ` Mark Brown
2020-06-15 12:01         ` Mark Brown
2020-06-18 16:44   ` Rob Herring
2020-06-18 16:44     ` Rob Herring
2020-06-18 16:44     ` Rob Herring
2020-06-18 16:44     ` Rob Herring
2020-06-18 16:44     ` Rob Herring
2020-06-18 16:44     ` Rob Herring
2020-06-15  6:46 ` [PATCH 14/29] dt: Fix broken references to renamed docs Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  7:48   ` Philipp Zabel
2020-06-15  7:48     ` Philipp Zabel
2020-06-15  7:48     ` Philipp Zabel
2020-06-15 11:18   ` Mark Brown
2020-06-15 11:18     ` Mark Brown
2020-06-15 11:18     ` Mark Brown
2020-06-18 17:06   ` Rob Herring
2020-06-18 17:06     ` Rob Herring
2020-06-18 17:06     ` Rob Herring
2020-06-15  6:46 ` [PATCH 15/29] dt: fix reference to olpc,xo1.75-ec.txt Mauro Carvalho Chehab
2020-06-16  8:20   ` Lubomir Rintel
2020-06-18 17:19   ` Rob Herring
2020-06-15  6:46 ` [PATCH 16/29] selftests/vm/keys: fix a broken reference at protection_keys.c Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 17/29] docs: hugetlbpage.rst: fix some warnings Mauro Carvalho Chehab
2020-06-15 11:52   ` Matthew Wilcox
2020-06-15  6:46 ` [PATCH 18/29] docs: powerpc: fix some issues at vas-api.rst Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 19/29] docs: driver-model: remove a duplicated markup at driver.rst Mauro Carvalho Chehab
2020-06-15  6:46 ` [PATCH 20/29] docs: watch_queue.rst: supress some Sphinx warnings and move to core-api Mauro Carvalho Chehab
2020-06-15  6:46   ` Mauro Carvalho Chehab
2020-06-15  6:47 ` [PATCH 21/29] docs: device-mapper: add dm-ebs.rst to an index file Mauro Carvalho Chehab
2020-06-19 16:18   ` Mike Snitzer
2020-06-19 16:18     ` Mike Snitzer
2020-06-15  6:47 ` [PATCH 22/29] docs: it_IT: add two missing references Mauro Carvalho Chehab
2020-06-15  7:39   ` Federico Vaga
2020-06-15  6:47 ` [PATCH 23/29] docs: ABI: fix a typo when pointing to w1-generic.rst Mauro Carvalho Chehab
2020-06-15  6:47 ` [PATCH 24/29] docs: fs: locking.rst: fix a broken table Mauro Carvalho Chehab
2020-06-15  6:47 ` [PATCH 25/29] docs: add bus-virt-phys-mapping.txt to core-api Mauro Carvalho Chehab
2020-06-15  6:47 ` [PATCH 26/29] docs: fix references for DMA*.txt files Mauro Carvalho Chehab
2020-06-15  6:47   ` Mauro Carvalho Chehab
2020-06-15  6:47   ` Mauro Carvalho Chehab
2020-06-15  6:47   ` Mauro Carvalho Chehab
2020-06-15 20:37   ` Paul E. McKenney
2020-06-15 20:37     ` Paul E. McKenney
2020-06-15 20:37     ` Paul E. McKenney
2020-06-15 20:37     ` Paul E. McKenney
2020-06-15  6:47 ` [PATCH 27/29] docs: dt: minor adjustments at writing-schema.rst Mauro Carvalho Chehab
2020-06-18 17:20   ` Rob Herring
2020-06-15  6:47 ` Mauro Carvalho Chehab [this message]
2020-06-15 11:17   ` [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge conflict Mark Brown
2020-06-15 18:24   ` Kees Cook
2020-06-15  6:47 ` [PATCH 29/29] docs: fs: proc.rst: convert a new chapter to ReST Mauro Carvalho Chehab
2020-06-15 18:24   ` Kees Cook

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7d46aec2cb7a5328d260c7c815b9be9737b43ee1.1592203542.git.mchehab+huawei@kernel.org \
    --to=mchehab+huawei@kernel.org \
    --cc=adobriyan@gmail.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=daniel.kiss@arm.com \
    --cc=keescook@chromium.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.