All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Linus Torvalds <torvalds@linuxfoundation.org>
Cc: Kees Cook <keescook@chromium.org>,
	tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: merging pull requests
Date: Fri, 1 Oct 2021 15:30:22 -0400	[thread overview]
Message-ID: <20211001193022.js63dt3ktovubdz3@meerkat.local> (raw)
In-Reply-To: <CAHk-=whZMDmgs3+djfUoVrx8jj7DwGOJvLWC=vw1dCMicqHJ1g@mail.gmail.com>

On Fri, Oct 01, 2021 at 11:47:12AM -0700, Linus Torvalds wrote:
> End result: Please don't make some crazy "b4 shazam" tool that handles
> pull requests and then makes it trivial for people to do automated
> merges too. That's absolutely the last thing we want to see.

Okay, it will for sure not do any automated merges. At most, it will provide
the contents of the cover letter (if present) as a convenient starting point.

What I like about "b4 shazam" is that it can make patch series work more like
pull requests. Once it's fetched and placed into FETCH_HEAD, maintainers can
either opt to do a merge, or rebase with their working branch and ff.

I expect that merges would be rare and only for large features that do require
a merge commit with a proper explanation (as you describe).

If any of these assumptions are wrong and I'm going down the wrong path,
please let me know.

-K

  reply	other threads:[~2021-10-01 19:30 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
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 [this message]
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=20211001193022.js63dt3ktovubdz3@meerkat.local \
    --to=konstantin@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=tools@linux.kernel.org \
    --cc=torvalds@linuxfoundation.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.