Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
docs: process: fix typos in Documentation/process/backporting.rst
Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
'appared' to 'appeared'.
Signed-off-by: Aryabhatta Dey <aryabhattadey35@gmail.com>
Reviewed-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/rd2vu7z2t23ppafto4zxc6jge5mj7w7xnpmwywaa2e3eiojgf2@poicxprsdoks
authored by
Aryabhatta Dey
and committed by
Jonathan Corbet
6e56774c
0769a1b7
+3
-3
+3
-3
Documentation/process/backporting.rst
+3
-3
Documentation/process/backporting.rst
···
73
73
your source tree. Don't forget to cherry-pick with ``-x`` if you want a
74
74
written record of where the patch came from!
75
75
76
-
Note that if you are submiting a patch for stable, the format is
76
+
Note that if you are submitting a patch for stable, the format is
77
77
slightly different; the first line after the subject line needs tobe
78
78
either::
79
79
···
147
147
It's important to always identify the commit or commits that caused the
148
148
conflict, as otherwise you cannot be confident in the correctness of
149
149
your resolution. As an added bonus, especially if the patch is in an
150
-
area you're not that famliar with, the changelogs of these commits will
150
+
area you're not that familiar with, the changelogs of these commits will
151
151
often give you the context to understand the code and potential problems
152
152
or pitfalls with your conflict resolution.
153
153
···
197
197
Another way to find prerequisite commits (albeit only the most recent
198
198
one for a given conflict) is to run ``git blame``. In this case, you
199
199
need to run it against the parent commit of the patch you are
200
-
cherry-picking and the file where the conflict appared, i.e.::
200
+
cherry-picking and the file where the conflict appeared, i.e.::
201
201
202
202
git blame <commit>^ -- <path>
203
203