summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinav Saxena <xandfury@gmail.com>2024-11-06 23:19:11 -0700
committerJonathan Corbet <corbet@lwn.net>2024-11-12 13:22:16 -0700
commit623e5747c680d3854b6b9882d9907096bc63580d (patch)
tree7722fb57238bccf164c1bee9e6fe8d1203b9fc68
parentef7d4c8206ce895e15b3e7cc50bd912477bc2ece (diff)
downloadlwn-623e5747c680d3854b6b9882d9907096bc63580d.tar.gz
lwn-623e5747c680d3854b6b9882d9907096bc63580d.zip
docs: fix typos and whitespace in Documentation/process/backporting.rst
- Fix repeated word "when" in backporting documentation - Remove trailing whitespace after '$' character These issues were reported by checkpatch.pl. No functional changes. Signed-off-by: Abhinav Saxena <xandfury@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20241107061911.106040-1-xandfury@gmail.com
-rw-r--r--Documentation/process/backporting.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/process/backporting.rst b/Documentation/process/backporting.rst
index 18e41e76ecba..c42779fbcd33 100644
--- a/Documentation/process/backporting.rst
+++ b/Documentation/process/backporting.rst
@@ -553,7 +553,7 @@ Submitting backports to stable
==============================
As the stable maintainers try to cherry-pick mainline fixes onto their
-stable kernels, they may send out emails asking for backports when when
+stable kernels, they may send out emails asking for backports when
encountering conflicts, see e.g.
<https://lore.kernel.org/stable/2023101528-jawed-shelving-071a@gregkh/>.
These emails typically include the exact steps you need to cherry-pick
@@ -563,9 +563,9 @@ One thing to make sure is that your changelog conforms to the expected
format::
<original patch title>
-
+
[ Upstream commit <mainline rev> ]
-
+
<rest of the original changelog>
[ <summary of the conflicts and their resolutions> ]
Signed-off-by: <your name and email>