* [PATCH] docs: process: fix typos in Documentation/process/backporting.rst
@ 2024-08-25 11:33 Aryabhatta Dey
2024-08-26 7:26 ` Vegard Nossum
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Aryabhatta Dey @ 2024-08-25 11:33 UTC (permalink / raw)
To: corbet, workflows, linux-doc, linux-kernel
Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
'appared' to 'appeared'.
Signed-off-by: Aryabhatta Dey <aryabhattadey35@gmail.com>
---
Documentation/process/backporting.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/process/backporting.rst b/Documentation/process/backporting.rst
index e1a6ea0a1e8a..a71480fcf3b4 100644
--- a/Documentation/process/backporting.rst
+++ b/Documentation/process/backporting.rst
@@ -73,7 +73,7 @@ Once you have the patch in git, you can go ahead and cherry-pick it into
your source tree. Don't forget to cherry-pick with ``-x`` if you want a
written record of where the patch came from!
-Note that if you are submiting a patch for stable, the format is
+Note that if you are submitting a patch for stable, the format is
slightly different; the first line after the subject line needs tobe
either::
@@ -147,7 +147,7 @@ divergence.
It's important to always identify the commit or commits that caused the
conflict, as otherwise you cannot be confident in the correctness of
your resolution. As an added bonus, especially if the patch is in an
-area you're not that famliar with, the changelogs of these commits will
+area you're not that familiar with, the changelogs of these commits will
often give you the context to understand the code and potential problems
or pitfalls with your conflict resolution.
@@ -197,7 +197,7 @@ git blame
Another way to find prerequisite commits (albeit only the most recent
one for a given conflict) is to run ``git blame``. In this case, you
need to run it against the parent commit of the patch you are
-cherry-picking and the file where the conflict appared, i.e.::
+cherry-picking and the file where the conflict appeared, i.e.::
git blame <commit>^ -- <path>
--
2.46.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: process: fix typos in Documentation/process/backporting.rst
2024-08-25 11:33 [PATCH] docs: process: fix typos in Documentation/process/backporting.rst Aryabhatta Dey
@ 2024-08-26 7:26 ` Vegard Nossum
2024-08-26 12:06 ` Bagas Sanjaya
2024-08-26 21:07 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Vegard Nossum @ 2024-08-26 7:26 UTC (permalink / raw)
To: Aryabhatta Dey, corbet, workflows, linux-doc, linux-kernel
On 25/08/2024 13:33, Aryabhatta Dey wrote:
> Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
> 'appared' to 'appeared'.
>
> Signed-off-by: Aryabhatta Dey <aryabhattadey35@gmail.com>
> ---
> Documentation/process/backporting.rst | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/process/backporting.rst b/Documentation/process/backporting.rst
> index e1a6ea0a1e8a..a71480fcf3b4 100644
> --- a/Documentation/process/backporting.rst
> +++ b/Documentation/process/backporting.rst
> @@ -73,7 +73,7 @@ Once you have the patch in git, you can go ahead and cherry-pick it into
> your source tree. Don't forget to cherry-pick with ``-x`` if you want a
> written record of where the patch came from!
>
> -Note that if you are submiting a patch for stable, the format is
> +Note that if you are submitting a patch for stable, the format is
> slightly different; the first line after the subject line needs tobe
There's another one here: "tobe"
> either::
>
> @@ -147,7 +147,7 @@ divergence.
> It's important to always identify the commit or commits that caused the
> conflict, as otherwise you cannot be confident in the correctness of
> your resolution. As an added bonus, especially if the patch is in an
> -area you're not that famliar with, the changelogs of these commits will
> +area you're not that familiar with, the changelogs of these commits will
> often give you the context to understand the code and potential problems
> or pitfalls with your conflict resolution.
>
> @@ -197,7 +197,7 @@ git blame
> Another way to find prerequisite commits (albeit only the most recent
> one for a given conflict) is to run ``git blame``. In this case, you
> need to run it against the parent commit of the patch you are
> -cherry-picking and the file where the conflict appared, i.e.::
> +cherry-picking and the file where the conflict appeared, i.e.::
>
> git blame <commit>^ -- <path>
>
Thanks for these fixes.
Reviewed-by: Vegard Nossum <vegard.nossum@oracle.com>
Vegard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: process: fix typos in Documentation/process/backporting.rst
2024-08-25 11:33 [PATCH] docs: process: fix typos in Documentation/process/backporting.rst Aryabhatta Dey
2024-08-26 7:26 ` Vegard Nossum
@ 2024-08-26 12:06 ` Bagas Sanjaya
2024-08-26 21:07 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Bagas Sanjaya @ 2024-08-26 12:06 UTC (permalink / raw)
To: Aryabhatta Dey, corbet, workflows, linux-doc, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
On Sun, Aug 25, 2024 at 05:03:40PM +0530, Aryabhatta Dey wrote:
> Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
> 'appared' to 'appeared'.
>
LGTM, thanks!
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: process: fix typos in Documentation/process/backporting.rst
2024-08-25 11:33 [PATCH] docs: process: fix typos in Documentation/process/backporting.rst Aryabhatta Dey
2024-08-26 7:26 ` Vegard Nossum
2024-08-26 12:06 ` Bagas Sanjaya
@ 2024-08-26 21:07 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Jonathan Corbet @ 2024-08-26 21:07 UTC (permalink / raw)
To: Aryabhatta Dey, workflows, linux-doc, linux-kernel
Aryabhatta Dey <aryabhattadey35@gmail.com> writes:
> Change 'submiting' to 'submitting', 'famliar' to 'familiar' and
> 'appared' to 'appeared'.
>
> Signed-off-by: Aryabhatta Dey <aryabhattadey35@gmail.com>
> ---
> Documentation/process/backporting.rst | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Applied, thanks.
jon
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-26 21:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-25 11:33 [PATCH] docs: process: fix typos in Documentation/process/backporting.rst Aryabhatta Dey
2024-08-26 7:26 ` Vegard Nossum
2024-08-26 12:06 ` Bagas Sanjaya
2024-08-26 21:07 ` Jonathan Corbet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox