Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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>
References: <877de6e589.fsf@disp2133>
        <CAHk-=wjAj+wgHXqkcGuQR9xo3C2G569TB2i5PmFLyK6BAkr2_w@mail.gmail.com>
Date:   Fri, 22 Oct 2021 09:59:57 -0500
In-Reply-To: <CAHk-=wjAj+wgHXqkcGuQR9xo3C2G569TB2i5PmFLyK6BAkr2_w@mail.gmail.com>
        (Linus Torvalds's message of "Thu, 21 Oct 2021 17:35:08 -1000")
Message-ID: <87fsst6r6a.fsf@disp2133>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [GIT PULL] ucount fixes for v5.15
Precedence: bulk

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