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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 364AEC2BB48 for ; Tue, 15 Dec 2020 10:05:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE2C4207CC for ; Tue, 15 Dec 2020 10:05:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE2C4207CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pL2+YWzjr9sLdbXZP1leVAvb8sKQTWcKYcwv9GmzByc=; b=z4MGeAlVY88rY4WqkkNcdaGQy m3zwAO4D2BVd3f3q09R7FXIzCm4djTb0LsARVF3IBTPlAJU+ZJyKlz+Ydupy9WHy7dqw0vggrZA7J YBGVN6esXqez5lZeFdCwntPkHfOT91bkNi7+AIt2fhq/fBi6V6bph1HoIsJk+IOE0S12pmzxL/7kZ f3la/QCsPfhL8nv4wBroXj0yp1dKpeag/qadDAKNremL8Gf+WZyXHeZz0yltQFVSJVrv7ODJ7wNaF Wjv8Hm2vlT1HpP1eyxDTzqnHAr1q8SVDBijj2xflSELaIIs3vaB1+bOFfPQy/Oh+P323wIywESLEm R96dZWoig==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp7BN-0006dc-CJ; Tue, 15 Dec 2020 10:03:49 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kp7BL-0006d6-EC for linux-arm-kernel@lists.infradead.org; Tue, 15 Dec 2020 10:03:48 +0000 Date: Tue, 15 Dec 2020 10:03:42 +0000 From: Catalin Marinas To: Linus Torvalds Subject: Re: [GIT PULL] arm64 updates for 5.11 Message-ID: <20201215100342.GA2511@gaia> References: <20201214182854.14862-1-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201215_050347_570359_8BF0846A X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Morton , Will Deacon , Eric Biederman , Linux ARM , Linux Kernel Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Dec 14, 2020 at 04:29:37PM -0800, Linus Torvalds wrote: > On Mon, Dec 14, 2020 at 10:29 AM Catalin Marinas > wrote: > > > > 114 files changed, 2392 insertions(+), 1401 deletions(-) > > My diffstat looked quite different, but that turns out to be because > you use "-C" to generate your patches with not just renames, but file > copies as well. Ah, I have diff.renames=copies in my .gitconfig (I don't remember why I added it; I'll change it to the default in case I forget the "--summary" option next time). > That's all fine, but can I ask you to also use "--summary" for your > diffstat, so that the end oif the diffstat also ends up explaining > that part (and you end up with a line that says > > copy arch/arm64/include/asm/{alternative.h => alternative-macros.h} (69%) > > because as it was, it took me a while to realize why your diffstat > numbers didn't match mine at all. Thanks for the hint. I actually did a "git show --stat" on my local merge commit. This doesn't seem to honour the "--summary" option (at least the git version I have, 2.20.1). The "git diff --stat --summary" works as expected. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel