netdev - Re: [GIT PULL] Networking for 5.16-rc6

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211216154324.5adcd94d@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Thu, 16 Dec 2021 15:43:24 -0800
From:   Jakub Kicinski <kuba@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     David Miller <davem@...emloft.net>,
        Netdev <netdev@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Johannes Berg <johannes@...solutions.net>,
        Kalle Valo <kvalo@...eaurora.org>
Subject: Re: [GIT PULL] Networking for 5.16-rc6

On Thu, 16 Dec 2021 15:14:27 -0800 Linus Torvalds wrote:
> On Thu, Dec 16, 2021 at 1:32 PM Jakub Kicinski <kuba@...nel.org> wrote:
> > Relatively large batches of fixes from BPF and the WiFi stack,
> > calm in general networking.  
> 
> Hmm. I get a very different diffstat, and also a different shortlog
> than the one you quote.
> 
> I do get the top commit you claim:
> 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git tags/net-5.16-rc6
> >
> > for you to fetch changes up to 0c3e2474605581375d808bb3b9ce0927ed3eef70:
> >
> >   Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2021-12-16 13:06:49 -0800)  
> 
> But your shortlog doesn't contain
> [...]
> and that seems to be the missing diffstat contents also.
> 
> It looks like your pull request was done without that last merge, even
> though you do mention it as being the top of tree.

But you are able to get the bpf patches, from the tag, right?

> I've pulled this, because that last merge looks fine and intentional,
> but I'd like you to double-check your workflow to see what happened to
> give a stale diffstat and shortlog...

Very strange, I didn't fix it up, redo or anything, push the tree, 
tag, push the tag, git request-pull >> email. And request-pull did 
not complain about anything.

I will double check all the outputs next time, really not sure how this
happened..

While I have you - I see that you drop my SoB at the end of the merge
message, usually. Should I not put it there?  I put it there because
of something I read in Documentation/process/...