tools.linux.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Leon Romanovsky" <leon@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>, Jakub Kicinski <kuba@kernel.org>,
	James Bottomley <James.Bottomley@hansenpartnership.com>,
	toke@toke.dk,
	Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
	users@linux.kernel.org, tools@linux.kernel.org,
	Jens Axboe <axboe@kernel.dk>
Subject: Re: [kernel.org users] b4: encouraging using the cover letter in merge commits?
Date: Tue, 22 Dec 2020 08:30:34 +0200	[thread overview]
Message-ID: <20201222063034.GC3128@unreal> (raw)
In-Reply-To: <20201221213012.GB433286@kernel.org>

On Mon, Dec 21, 2020 at 06:30:12PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Mon, Dec 21, 2020 at 03:05:52PM -0400, Jason Gunthorpe escreveu:
> > On Sat, Dec 19, 2020 at 09:21:26AM -0800, Jakub Kicinski wrote:
> > > On Sat, 19 Dec 2020 09:03:36 -0800 James Bottomley wrote:
> > > > > I agree that the cover letter is useful more often than not and
> > > > > ideally it would be included in most cases. In netdev/bpf land the
> > > > > maintainers do this by always creating a merge commit when applying a
> > > > > multi-part series; here's Daniel applying one of mine, for instance:
> > > > >
> > > > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=4e083fdfa39db29bbc7725e229e701867d0da183
> > > > >
> > > > > I personally think this practice is pretty nice, and so I was hoping
> > > > > that supporting this workflow in b4 could be a way to encourage other
> > > > > maintainers to take up the practice as well :)
> > > >
> > > > I've got to say that creating a spurious merge for the cover letter
> > > > looks even more tortuous than creating an empty commit.  What
> > > > advantages does this have over the existing link tag practice which is
> > > > the one that we now use instead of the empty commit?
> > >
> > > May be a chicken and an egg problem in case of other subsystems.
> > >
> > > DaveM started creating those merge commits long before Links were
> > > a thing (let alone lore). That gave netdev developers the ability
> > > to provide a high level description of their work, reasons, goals
> > > in the cover letter, rather than one of the commit messages. For
> > > a series with changes finely split for ease of review it's often
> > > awkward to pick on which commit to put that information.
> > >
> > > Obviously the cover letter information may be made available via
> > > the Link, but there's obvious value in seeing the information in
> > > the repo, after all we don't replace commit messages with links.
>
> > My biggest problem with the cover letters is while the are in the
> > repository, someplace, I've never actually found one while hunting
> > around in the git history for clues, eg with 'git blame' or 'git log
> > log -p'
>
> Well, they don't get merged, this is the point of this thread :-\

In the netdev flow, the cover letters are merged.
See commit 28f53159e121 ("Merge branch 'vsock-add-flags-field-in-the-vsock-address'")

Thanks

  reply	other threads:[~2020-12-22  6:30 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18 21:32 b4: encouraging using the cover letter in merge commits? Toke Høiland-Jørgensen
2020-12-18 22:09 ` Konstantin Ryabitsev
2020-12-19 12:29   ` Toke Høiland-Jørgensen
2020-12-18 22:38 ` [kernel.org users] " James Bottomley
2020-12-19 12:34   ` Toke Høiland-Jørgensen
2020-12-19 17:03     ` James Bottomley
2020-12-19 17:21       ` Jakub Kicinski
2020-12-19 17:32         ` James Bottomley
2020-12-21 19:05         ` Jason Gunthorpe
2020-12-21 21:13           ` Michal Kubeček
2020-12-21 21:30           ` Arnaldo Carvalho de Melo
2020-12-22  6:30             ` Leon Romanovsky [this message]
2020-12-22  8:14               ` Geert Uytterhoeven
2020-12-22 12:36                 ` Leon Romanovsky
2021-01-05 13:38                 ` Jason Gunthorpe
2020-12-19 18:45       ` Jonathan Corbet
2020-12-19 18:49         ` James Bottomley
2020-12-19 18:57           ` Jonathan Corbet
2020-12-19 19:03             ` James Bottomley
2020-12-19 20:48               ` Arnaldo Carvalho de Melo
2020-12-19 21:01                 ` James Bottomley
2020-12-19 21:43                   ` Arnaldo Carvalho de Melo
2020-12-19 21:57                     ` James Bottomley
2020-12-19 22:17                       ` Arnaldo Carvalho de Melo
2020-12-19 23:34                         ` James Bottomley
2020-12-21 17:34       ` [tools] " Mark Brown

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=20201222063034.GC3128@unreal \
    --to=leon@kernel.org \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=acme@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=jgg@ziepe.ca \
    --cc=konstantin@linuxfoundation.org \
    --cc=kuba@kernel.org \
    --cc=toke@toke.dk \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).