lkml.org 
[lkml]   [2021]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@kernel.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/...

\
 
 \ /
  Last update: 2021-12-17 00:44    [W:0.105 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site