mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-04-13 09:59:31 +00:00
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
This commit is contained in:
parent
ef7d4c8206
commit
623e5747c6
1 changed files with 3 additions and 3 deletions
|
@ -553,7 +553,7 @@ Submitting backports to stable
|
||||||
==============================
|
==============================
|
||||||
|
|
||||||
As the stable maintainers try to cherry-pick mainline fixes onto their
|
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.
|
encountering conflicts, see e.g.
|
||||||
<https://lore.kernel.org/stable/2023101528-jawed-shelving-071a@gregkh/>.
|
<https://lore.kernel.org/stable/2023101528-jawed-shelving-071a@gregkh/>.
|
||||||
These emails typically include the exact steps you need to cherry-pick
|
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::
|
format::
|
||||||
|
|
||||||
<original patch title>
|
<original patch title>
|
||||||
|
|
||||||
[ Upstream commit <mainline rev> ]
|
[ Upstream commit <mainline rev> ]
|
||||||
|
|
||||||
<rest of the original changelog>
|
<rest of the original changelog>
|
||||||
[ <summary of the conflicts and their resolutions> ]
|
[ <summary of the conflicts and their resolutions> ]
|
||||||
Signed-off-by: <your name and email>
|
Signed-off-by: <your name and email>
|
||||||
|
|
Loading…
Add table
Reference in a new issue