From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DC57C433F5 for ; Fri, 22 Oct 2021 15:01:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3522261205 for ; Fri, 22 Oct 2021 15:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233171AbhJVPDm (ORCPT ); Fri, 22 Oct 2021 11:03:42 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:40412 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233143AbhJVPDj (ORCPT ); Fri, 22 Oct 2021 11:03:39 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]:46816) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1mdw2r-003aFJ-0J; Fri, 22 Oct 2021 09:01:21 -0600 Received: from ip68-227-160-95.om.om.cox.net ([68.227.160.95]:34440 helo=email.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1mdw2p-00Ev8j-A8; Fri, 22 Oct 2021 09:01:20 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Linus Torvalds Cc: Linux Kernel Mailing List , Alexey Gladkov , Rune Kleveland , Yu Zhao , Jordan Glover , Antoine Martin , David Howells , Jarkko Sakkinen References: <877de6e589.fsf@disp2133> Date: Fri, 22 Oct 2021 09:59:57 -0500 In-Reply-To: (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 X-XM-SPF: eid=1mdw2p-00Ev8j-A8;;;mid=<87fsst6r6a.fsf@disp2133>;;;hst=in01.mta.xmission.com;;;ip=68.227.160.95;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1+trmELuUB54LDvZVfvhFlo7HQc4mnbrD4= X-SA-Exim-Connect-IP: 68.227.160.95 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: Re: [GIT PULL] ucount fixes for v5.15 X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds writes: > On Thu, Oct 21, 2021 at 6:04 AM Eric W. Biederman 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