From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>
Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: merging pull requests
Date: Fri, 1 Oct 2021 09:22:31 +1000 [thread overview]
Message-ID: <20211001092231.6fefb6c7@canb.auug.org.au> (raw)
In-Reply-To: <202109301559.A9BFB03@keescook>
[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]
Hi Kees,
On Thu, 30 Sep 2021 16:09:13 -0700 Kees Cook <keescook@chromium.org> wrote:
>
> I think so -- that seems to be sort of what Linus does? There seem to be
> a few templates (tag, branch, and "patches from Andrew"), e.g.:
>
> Merge tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
> Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
> Merge branch 'akpm' (patches from Andrew)
>
> Though I'd love to know why there's a distinction between "tag" and
> "branch" here. Are "branch" pulls not checked for signatures?
I assume it depends on what Linus is asked to pull/merge. i.e. if the
pull request refers to a tag then Linus will just merge that tag. Some
people just ask Linus to merge a branch from their tree. In Andrew's
case, he sends patch series which Linus would import into a local
branch ("akpm") and then merge that.
The messages seem to mostly be the default git message for a merge
(sometimes maybe editted a bit).
For linux-next, I fetch all the branches into remotes in my tree and
then merge them later. I have recently changed my merges to include the
source tree and branch in the merge message (previously, all you saws
was the local name of the remote branch).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-09-30 23:28 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 17:33 merging pull requests Kees Cook
2021-09-30 20:00 ` Konstantin Ryabitsev
2021-09-30 23:09 ` Kees Cook
2021-09-30 23:22 ` Stephen Rothwell [this message]
2021-09-30 23:29 ` Kees Cook
2021-09-30 23:29 ` Stephen Rothwell
2021-09-30 23:42 ` Kees Cook
2021-10-01 11:59 ` Jason Gunthorpe
2021-10-02 0:15 ` Kees Cook
2021-10-01 17:01 ` Steven Rostedt
2021-10-01 17:07 ` James Bottomley
2021-10-02 0:17 ` Kees Cook
2021-10-01 17:19 ` Konstantin Ryabitsev
2021-10-02 2:35 ` Kees Cook
2021-09-30 23:31 ` Olof Johansson
2021-10-01 0:09 ` Kees Cook
2021-10-01 0:27 ` Olof Johansson
2021-10-01 17:05 ` Steven Rostedt
2021-10-02 0:12 ` Kees Cook
2021-10-01 18:26 ` Konstantin Ryabitsev
2021-10-01 18:47 ` Linus Torvalds
2021-10-01 19:30 ` Konstantin Ryabitsev
2021-10-02 0:08 ` Kees Cook
2021-10-02 6:22 ` Willy Tarreau
2021-10-02 0:11 ` Kees Cook
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=20211001092231.6fefb6c7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=keescook@chromium.org \
--cc=konstantin@linuxfoundation.org \
--cc=tools@linux.kernel.org \
--cc=users@linux.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.