[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87fsst6r6a.fsf@disp2133>
Date: Fri, 22 Oct 2021 09:59:57 -0500
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Alexey Gladkov <legion@...nel.org>,
Rune Kleveland <rune.kleveland@...omedia.dk>,
Yu Zhao <yuzhao@...gle.com>,
Jordan Glover <Golden_Miller83@...tonmail.ch>,
Antoine Martin <antoine@...afix.co.uk>,
David Howells <dhowells@...hat.com>,
Jarkko Sakkinen <jarkko@...nel.org>
Subject: Re: [GIT PULL] ucount fixes for v5.15
Linus Torvalds <torvalds@...ux-foundation.org> writes:
> On Thu, Oct 21, 2021 at 6:04 AM Eric W. Biederman <ebiederm@...ssion.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
Powered by blists - more mailing lists