workflows.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vegard Nossum <vegard.nossum@oracle.com>
To: Aryabhatta Dey <aryabhattadey35@gmail.com>,
	corbet@lwn.net, workflows@vger.kernel.org,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] docs: process: fix typos in Documentation/process/backporting.rst
Date: Mon, 26 Aug 2024 09:26:14 +0200	[thread overview]
Message-ID: <56c6883e-26e6-4cc4-b731-337c454ce411@oracle.com> (raw)
In-Reply-To: <rd2vu7z2t23ppafto4zxc6jge5mj7w7xnpmwywaa2e3eiojgf2@poicxprsdoks>


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

  reply	other threads:[~2024-08-26  7:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-25 11:33 Aryabhatta Dey
2024-08-26  7:26 ` Vegard Nossum [this message]
2024-08-26 12:06 ` Bagas Sanjaya
2024-08-26 21:07 ` Jonathan Corbet

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=56c6883e-26e6-4cc4-b731-337c454ce411@oracle.com \
    --to=vegard.nossum@oracle.com \
    --cc=aryabhattadey35@gmail.com \
    --cc=corbet@lwn.net \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=workflows@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox