public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Alexey Gladkov <legion@kernel.org>,
	Rune Kleveland <rune.kleveland@infomedia.dk>,
	Yu Zhao <yuzhao@google.com>,
	Jordan Glover <Golden_Miller83@protonmail.ch>,
	Antoine Martin <antoine@nagafix.co.uk>,
	David Howells <dhowells@redhat.com>,
	Jarkko Sakkinen <jarkko@kernel.org>
Subject: Re: [GIT PULL] ucount fixes for v5.15
Date: Fri, 22 Oct 2021 09:59:57 -0500	[thread overview]
Message-ID: <87fsst6r6a.fsf@disp2133> (raw)
In-Reply-To: <CAHk-=wjAj+wgHXqkcGuQR9xo3C2G569TB2i5PmFLyK6BAkr2_w@mail.gmail.com> (Linus Torvalds's message of "Thu, 21 Oct 2021 17:35:08 -1000")

Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Thu, Oct 21, 2021 at 6:04 AM Eric W. Biederman <ebiederm@xmission.com> wrote:
>>
>>  kernel/cred.c                | 9 ++++-----
>>  security/keys/process_keys.c | 8 ++++++++
>>  2 files changed, 12 insertions(+), 5 deletions(-)
>
> That's not remotely the right diffstat.
>
> What's going on?

Sigh.  I sent the diffstat from when I sent the additional patches
out for review instead of the diffstat for the entire branch I was
asking you to pull.

I really should have named things differently on my end when I sent
the additional changes out for review.

The correct diffstat should have been.

 include/linux/user_namespace.h |  2 ++
 kernel/cred.c                  |  9 ++++----
 kernel/signal.c                | 25 ++++++---------------
 kernel/ucount.c                | 49 ++++++++++++++++++++++++++++++++++++++++++
 security/keys/process_keys.c   |  8 +++++++
 5 files changed, 69 insertions(+), 24 deletions(-)


> The shortlog was correct, and I pulled the branch, because everything
> else looked ok, but that diffstat in the pull request was some
> complete fantasy.
>
> If I were to guess, I think the diffstat may be everything _but_ that
> first ("ucounts: Fix signal ucount refcounting") fix. I just don't see
> how/why you'd get that as part of the pull request.

You are exactly right.

My apologies for the confusion.
Eric

  reply	other threads:[~2021-10-22 15:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-21 16:02 [GIT PULL] ucount fixes for v5.15 Eric W. Biederman
2021-10-22  3:35 ` Linus Torvalds
2021-10-22 14:59   ` Eric W. Biederman [this message]
2021-10-22  5:10 ` 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=87fsst6r6a.fsf@disp2133 \
    --to=ebiederm@xmission.com \
    --cc=Golden_Miller83@protonmail.ch \
    --cc=antoine@nagafix.co.uk \
    --cc=dhowells@redhat.com \
    --cc=jarkko@kernel.org \
    --cc=legion@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rune.kleveland@infomedia.dk \
    --cc=torvalds@linux-foundation.org \
    --cc=yuzhao@google.com \
    /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