linux-kernel - Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAOesGMjzU7bgX97_N08sLPsEew_6iHeQAi4EKgFK9EZVmMP+sQ@mail.gmail.com>
Date:   Sat, 10 Jul 2021 18:41:50 -0700
From:   Olof Johansson <olof@...om.net>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     ARM SoC <arm@...nel.org>, SoC Team <soc@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14

On Sat, Jul 10, 2021 at 9:45 AM Linus Torvalds
<torvalds@...ux-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@...om.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