From: Greg KH <gregkh@linuxfoundation.org>
To: Nick Desaulniers <ndesaulniers@google.com>
Cc: "# 3.4.x" <stable@vger.kernel.org>,
Sasha Levin <sashal@kernel.org>,
clang-built-linux <clang-built-linux@googlegroups.com>
Subject: Re: commit <sha> upstream. vs git cherry-pick -x
Date: Thu, 11 Mar 2021 08:00:51 +0100 [thread overview]
Message-ID: <YEnAI2xuoaM+B04f@kroah.com> (raw)
In-Reply-To: <CAKwvOdmAEKQmi-Hy4Gi33t4nb3mCuKUd_qmbEdwrkRwezAWpiA@mail.gmail.com>
On Wed, Mar 10, 2021 at 02:37:03PM -0800, Nick Desaulniers wrote:
> Hello stable maintainers,
> While working on some backports I'm about to send hopefully today or
> tomorrow, I was curious why the convention seems to be for folks to
> use "commit <sha> upstream." in commit messages? I know that's what's
> in https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-3,
> but I was curious whether the format from `git cherry-pick -xs <sha>`
> is not acceptable? I assume there's context as to why not? It is nice
> to have that info uniformly near the top, but I find myself having to
> cherry-pick then amend a lot. Or is there an option in git to
> automate the stable kernel's preferred style?
There is no option in git, but I do have a script:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/scripts/c2p
that takes a git id and turns it into the format we use.
I think Sasha has one somewhere as well that does it in a nicer way
(mine is in perl and hard-codes a lot of stuff).
thanks,
greg k-h
prev parent reply other threads:[~2021-03-11 7:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 22:37 commit <sha> upstream. vs git cherry-pick -x Nick Desaulniers
2021-03-10 23:35 ` Sasha Levin
2021-03-11 7:00 ` Greg KH [this message]
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=YEnAI2xuoaM+B04f@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=clang-built-linux@googlegroups.com \
--cc=ndesaulniers@google.com \
--cc=sashal@kernel.org \
--cc=stable@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