linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: James Bottomley <James.Bottomley@hansenpartnership.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-scsi <linux-scsi@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] final round of SCSI updates for the 5.15+ merge window
Date: Fri, 12 Nov 2021 12:34:22 -0800	[thread overview]
Message-ID: <CAHk-=wgJz2-KgygzF6s4D80=ib0AmP99TGd3Wgc_GqyKg1=pHA@mail.gmail.com> (raw)
In-Reply-To: <d9405d786496756564b31540cc73a9d22cc97730.camel@HansenPartnership.com>

On Fri, Nov 12, 2021 at 5:43 AM James Bottomley
<James.Bottomley@hansenpartnership.com> wrote:
>
> This series is all the stragglers that didn't quite make the first
> merge window pull.  It's mostly minor updates and bug fixes of merge
> window code but it also has two driver updates: ufs and qla2xxx.

Hmm? No diffstat?

I suspect it's because there's a merge in there, and thus multiple
merge base commits, and the autogenerated diffstat ends up being
worthless.

In that situation, the nice thing to do is to at least tell me why
there's no diffstat, but optimally you can do a temporary throw-away
merge in a temporary branch just to get the diffstat.

And yes, "git request-pull" could do that, automating this all and
reporting any conflicts at the same time.

But git historically did *not* do that just because it requires a
working tree and can be messy, and because the "just do the diff from
the merge base" works fine for maintainers that don't do merges
themselves, and so the only maintainers that can hit this issue are
the maintainers that also should be able to do that temporary merge
thing on their own.

Anyway, I don't require that temporary merge, but I _do_ really want
to get notified of "look, I did the diffstat, and it was useless
garbage, so I'm not including it here".

Because as-is, this just looks like an incomplete pull request.

I've done the pull, verified the shortlog, and checked that the
(proper) diffstat all looks sane. But I am writing this email just to
say "you could have done so much better".

                 Linus

  reply	other threads:[~2021-11-12 20:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-12 13:43 [GIT PULL] final round of SCSI updates for the 5.15+ merge window James Bottomley
2021-11-12 20:34 ` Linus Torvalds [this message]
2021-11-12 22:03   ` James Bottomley
2021-11-12 20:42 ` pr-tracker-bot

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='CAHk-=wgJz2-KgygzF6s4D80=ib0AmP99TGd3Wgc_GqyKg1=pHA@mail.gmail.com' \
    --to=torvalds@linux-foundation.org \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@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;
as well as URLs for NNTP newsgroup(s).