linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: ARM SoC <arm@kernel.org>, SoC Team <soc@kernel.org>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	 Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14
Date: Sat, 10 Jul 2021 18:41:50 -0700	[thread overview]
Message-ID: <CAOesGMjzU7bgX97_N08sLPsEew_6iHeQAi4EKgFK9EZVmMP+sQ@mail.gmail.com> (raw)
In-Reply-To: <CAHk-=wg2G+4K=wCnHBsiFX2HXH+zN5X_VhmMa9-RsFLL+xMFyg@mail.gmail.com>

On Sat, Jul 10, 2021 at 9:45 AM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> What?
>
> My shortlog matches yours, but my diffstat isn't even close.
>
> You show 554 commits, but then your diffstat as not a single file from
> arch/arm*/boot/dts, and says:
>
> On Fri, Jul 9, 2021 at 4:41 PM Olof Johansson <olof@lixom.net> wrote:
> >
> >  97 files changed, 8428 insertions(+), 5174 deletions(-)
>
> while mine is very different indeed:
>
>  552 files changed, 24060 insertions(+), 3691 deletions(-)
>
> I suspect you got the diffstat from something else entirely, because
> mine looks a lot more believable and matches the commits listed in the
> shortlog a lot better..

Yeah, this was an operator error at my end due to the workflow I have
when I generate the pull requests. Thanks for noticing, and as you saw
on the 3rd branch, the info was swapped between them.

For more detail in case anyone is interested:

I merge the set of pull requests one by one on top of your branch, and
then run a script that generates the pull requests. At least when we
started out, git request-pull got confused and generated wrong info
when we had complex merges.

This time around I generated them backwards: Merged all 4, then
generated the last pull request email, reset back to the next head
(with the previous branch), generated that, etc.

The mistake here is that I mixed up the order of the two middle ones.
So I specified the tag (and got the commit message from it), but
obviously the diffstats and the shortlogs ended up generated from what
was in the working tree, i.e. the other branch.

My bad, and something I'll double check for in the future or add a
sanity-check for in the script.


-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2021-07-11  1:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-09 23:40 [GIT PULL 1/4] ARM: SoC changes " Olof Johansson
2021-07-09 23:40 ` [GIT PULL 2/4] ARM: Devicetree material " Olof Johansson
2021-07-10 16:45   ` Linus Torvalds
2021-07-11  1:41     ` Olof Johansson [this message]
2021-07-10 17:35   ` pr-tracker-bot
2021-07-09 23:40 ` [GIT PULL 3/4] ARM: Drivers " Olof Johansson
2021-07-10 16:47   ` Linus Torvalds
2021-07-10 17:35   ` pr-tracker-bot
2021-07-09 23:40 ` [GIT PULL 4/4] ARM: Defconfig changes " Olof Johansson
2021-07-10 17:35   ` pr-tracker-bot
2021-07-10 17:35 ` [GIT PULL 1/4] ARM: SoC " 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=CAOesGMjzU7bgX97_N08sLPsEew_6iHeQAi4EKgFK9EZVmMP+sQ@mail.gmail.com \
    --to=olof@lixom.net \
    --cc=arm@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=soc@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14' \
    /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

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).