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=-3.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,SPF_HELO_NONE,SPF_PASS 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 5044FC07E95 for ; Sun, 11 Jul 2021 01:42:03 +0000 (UTC) Received: by mail.kernel.org (Postfix) id DE5236135C; Sun, 11 Jul 2021 01:42:02 +0000 (UTC) Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88ED061289 for ; Sun, 11 Jul 2021 01:42:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88ED061289 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lixom.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=olof@lixom.net Received: by mail-io1-f53.google.com with SMTP id k11so17706162ioa.5 for ; Sat, 10 Jul 2021 18:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=aEKYNlLyKmBIhtj2zpIjSnRJ+Qd4EOAwRFeseUtJvCj6OD+ekcsQK39PN/zn6cNbHl WGSEQ2S8qlVvBsOEXTGLUc/zrTpNltS/TXx2jqMA41Jqqjmj/Af+gcz+Wfc2H871qsbD kKOMiwfZo5T7EKQAU1PHMq4l/nkGMMHdValSnpEVrSptiF7e6jcC1kJ19HoiU7LfIZkF /XwH6CJ/JhwJf3FzqaXGVRZUtIzo6ZiOIzO6wkbPoi+W9jHLWPTMvUOdtbP8FR5nZFlA lC/t59OmgEJe5VGRTKxlrBEtrR3vgxjt1E3MV5HMMAyFnqCO9LazZ+8fTjSIz9M7RjA3 IFVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=TZd8RiScrPLxDAVc+VIpql3XxeKY214w8vhI0cOmL0Y/KbmaIH5PTDHZ4sLxEaCtp5 AHFzhRDdKTDb0J740PyjyEBTMmxuanytxFXu//hHCmKhkbLKrXwa4jWU1JftjhRI2yj5 aye9a1aZbGbS3AOXTKc0bMAvZ+Bb/D6b0UYVRFCG45DURX1YZGhoqgai0VatMryldgHr u+r8/6JbGi3F5XK2+3c4XFUkFWZa4GPLwQjEyiJu+6am7WtGri9Bv48VJmbly7QrXkwe VhCjguo/0pwSeHl7rSE+vGW1hu0J0lLF8t5EVwD6Eq+WYAe7pFTFghJxSfaLEjvmC9+c Uomw== X-Gm-Message-State: AOAM532sXBG6IEgpQ61VBS/5uwQvVJzdPaZoROyt++YQNzORYFtQmg2m LmH38cH9Pzf6dENSkqfGdajVInFgKeMer1pYfO82Ww== X-Google-Smtp-Source: ABdhPJx+rpq4HSXSp6jfp7UQ0J9hdUAfM226zfK6hZLavZmabddYLhfL+ajhRe1PyVE3+Be8kXbBeehdncaxRpDO7es= X-Received: by 2002:a5d:9051:: with SMTP id v17mr33836994ioq.81.1625967721832; Sat, 10 Jul 2021 18:42:01 -0700 (PDT) MIME-Version: 1.0 References: <20210709234054.10288-1-olof@lixom.net> <20210709234054.10288-2-olof@lixom.net> In-Reply-To: From: Olof Johansson Date: Sat, 10 Jul 2021 18:41:50 -0700 Message-ID: Subject: Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14 To: Linus Torvalds List-Id: Cc: ARM SoC , SoC Team , Linux Kernel Mailing List , Linux ARM Content-Type: text/plain; charset="UTF-8" On Sat, Jul 10, 2021 at 9:45 AM Linus Torvalds wrote: > > What? > > My shortlog matches yours, but my diffstat isn't even close. > > You show 554 commits, but then your diffstat as not a single file from > arch/arm*/boot/dts, and says: > > On Fri, Jul 9, 2021 at 4:41 PM Olof Johansson wrote: > > > > 97 files changed, 8428 insertions(+), 5174 deletions(-) > > while mine is very different indeed: > > 552 files changed, 24060 insertions(+), 3691 deletions(-) > > I suspect you got the diffstat from something else entirely, because > mine looks a lot more believable and matches the commits listed in the > shortlog a lot better.. Yeah, this was an operator error at my end due to the workflow I have when I generate the pull requests. Thanks for noticing, and as you saw on the 3rd branch, the info was swapped between them. For more detail in case anyone is interested: I merge the set of pull requests one by one on top of your branch, and then run a script that generates the pull requests. At least when we started out, git request-pull got confused and generated wrong info when we had complex merges. This time around I generated them backwards: Merged all 4, then generated the last pull request email, reset back to the next head (with the previous branch), generated that, etc. The mistake here is that I mixed up the order of the two middle ones. So I specified the tag (and got the commit message from it), but obviously the diffstats and the shortlogs ended up generated from what was in the working tree, i.e. the other branch. My bad, and something I'll double check for in the future or add a sanity-check for in the script. -Olof 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=-4.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 E1E31C07E95 for ; Sun, 11 Jul 2021 01:42:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA09B61278 for ; Sun, 11 Jul 2021 01:42:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230408AbhGKBou (ORCPT ); Sat, 10 Jul 2021 21:44:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229640AbhGKBot (ORCPT ); Sat, 10 Jul 2021 21:44:49 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 289CFC0613DD for ; Sat, 10 Jul 2021 18:42:03 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id k16so17615387ios.10 for ; Sat, 10 Jul 2021 18:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=aEKYNlLyKmBIhtj2zpIjSnRJ+Qd4EOAwRFeseUtJvCj6OD+ekcsQK39PN/zn6cNbHl WGSEQ2S8qlVvBsOEXTGLUc/zrTpNltS/TXx2jqMA41Jqqjmj/Af+gcz+Wfc2H871qsbD kKOMiwfZo5T7EKQAU1PHMq4l/nkGMMHdValSnpEVrSptiF7e6jcC1kJ19HoiU7LfIZkF /XwH6CJ/JhwJf3FzqaXGVRZUtIzo6ZiOIzO6wkbPoi+W9jHLWPTMvUOdtbP8FR5nZFlA lC/t59OmgEJe5VGRTKxlrBEtrR3vgxjt1E3MV5HMMAyFnqCO9LazZ+8fTjSIz9M7RjA3 IFVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=ZOt1gTdVgFUZdT8J5ho3yHu0V7qu7LGh04WLhADNz76Rib7e5FrPiIONUA4tjk3ofL zEAv72O+MOP/ON89LQF8lRftV4Kvc+i8OylFxbV844hIAxz4neCsIEPnkMEsrrly4JsH uy2sZtZ0FKCMKUhH9cJD75/yPXMJz0jJj1VCb8oxL6lSM6zaElUQEj0AzMd8GJu2A+sJ LeqHWE+KTIOHUGoj5OLYWDwqAvkp7jXVo5AVNuM07XCPYSAr7yUSTxfQZWSwYDWbkVew D0c4J1nT9o8omYTGMbQt1w4IYx0GGGZL21gh7eZQb69u5GS1+iS+rYAJ1ayYNeFVRl0E YZBw== X-Gm-Message-State: AOAM530aU2Ux4Zm9Tn6miqDl4XJMHVFpJQ5Z2kpEo1AhHw4SRATMSoXk NH5BA5g3auoZ70VujHkWlub99LQ1EPPQMm3BftJAJZtOLWw= X-Google-Smtp-Source: ABdhPJx+rpq4HSXSp6jfp7UQ0J9hdUAfM226zfK6hZLavZmabddYLhfL+ajhRe1PyVE3+Be8kXbBeehdncaxRpDO7es= X-Received: by 2002:a5d:9051:: with SMTP id v17mr33836994ioq.81.1625967721832; Sat, 10 Jul 2021 18:42:01 -0700 (PDT) MIME-Version: 1.0 References: <20210709234054.10288-1-olof@lixom.net> <20210709234054.10288-2-olof@lixom.net> In-Reply-To: From: Olof Johansson Date: Sat, 10 Jul 2021 18:41:50 -0700 Message-ID: Subject: Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14 To: Linus Torvalds List-Id: Cc: ARM SoC , SoC Team , Linux Kernel Mailing List , Linux ARM Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Message-ID: <20210711014150.pK7Du0Sys2I-do7-Q53e5AO5Xmu8r0XYreqlqOSiVFI@z> On Sat, Jul 10, 2021 at 9:45 AM Linus Torvalds wrote: > > What? > > My shortlog matches yours, but my diffstat isn't even close. > > You show 554 commits, but then your diffstat as not a single file from > arch/arm*/boot/dts, and says: > > On Fri, Jul 9, 2021 at 4:41 PM Olof Johansson wrote: > > > > 97 files changed, 8428 insertions(+), 5174 deletions(-) > > while mine is very different indeed: > > 552 files changed, 24060 insertions(+), 3691 deletions(-) > > I suspect you got the diffstat from something else entirely, because > mine looks a lot more believable and matches the commits listed in the > shortlog a lot better.. Yeah, this was an operator error at my end due to the workflow I have when I generate the pull requests. Thanks for noticing, and as you saw on the 3rd branch, the info was swapped between them. For more detail in case anyone is interested: I merge the set of pull requests one by one on top of your branch, and then run a script that generates the pull requests. At least when we started out, git request-pull got confused and generated wrong info when we had complex merges. This time around I generated them backwards: Merged all 4, then generated the last pull request email, reset back to the next head (with the previous branch), generated that, etc. The mistake here is that I mixed up the order of the two middle ones. So I specified the tag (and got the commit message from it), but obviously the diffstats and the shortlogs ended up generated from what was in the working tree, i.e. the other branch. My bad, and something I'll double check for in the future or add a sanity-check for in the script. -Olof 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=-4.5 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 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 C0C3CC07E95 for ; Sun, 11 Jul 2021 01:43:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7345F61278 for ; Sun, 11 Jul 2021 01:43:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7345F61278 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lixom.net 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Gv8fNih1EJ8AAwh5EQ+knd38Ad7RPy+tXpAdd4VwdHs=; b=ahn9ZejBOCVXOE iT5UcXUsfQ3zzhof5I2UsI8YsCiyyGfbp/NE6b4Jn/J+sqdD6m3QPJXcsdpBMiFFAw545eNkwD6hZ T66/D8gsd5iWWFoBN1p+bE4xkVBad/4S21RtbeDOObZ+HOSjU9jSQaJCIh7qjLp53bCRMFpDQm/sg rgeRcOxCxd9bxA6oNxCWGoJDyXf1x+qz0fRvCZ/iL7neZxysa+DMeW/Q/UkrnGN3m+lXway0aAFZ1 Uxo4Ucv4dc5ejO1v2v+8lyN+kY5FRR8AhALFiQcb3T4pRJi3Sm6v9c3dv5wSYcHvqGx8BzkN1wTNR eCocDtfuBFRtT2vSjdRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2OTv-004Tph-6Y; Sun, 11 Jul 2021 01:42:07 +0000 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2OTr-004Toq-KM for linux-arm-kernel@lists.infradead.org; Sun, 11 Jul 2021 01:42:05 +0000 Received: by mail-io1-xd35.google.com with SMTP id l5so17639464iok.7 for ; Sat, 10 Jul 2021 18:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=aEKYNlLyKmBIhtj2zpIjSnRJ+Qd4EOAwRFeseUtJvCj6OD+ekcsQK39PN/zn6cNbHl WGSEQ2S8qlVvBsOEXTGLUc/zrTpNltS/TXx2jqMA41Jqqjmj/Af+gcz+Wfc2H871qsbD kKOMiwfZo5T7EKQAU1PHMq4l/nkGMMHdValSnpEVrSptiF7e6jcC1kJ19HoiU7LfIZkF /XwH6CJ/JhwJf3FzqaXGVRZUtIzo6ZiOIzO6wkbPoi+W9jHLWPTMvUOdtbP8FR5nZFlA lC/t59OmgEJe5VGRTKxlrBEtrR3vgxjt1E3MV5HMMAyFnqCO9LazZ+8fTjSIz9M7RjA3 IFVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DviByeW/MRd4o8QAxjQbNiyDl13TlKgHIeZcYevPf8U=; b=nLSVtOU5bikbM1sZQ0vG5bl3BvHVkwnhT/mQhMqF2OjyC21+o4siAZZXD4ye8NPj8r 4gyd+kNZme/PhAzgwvtgpPmiQx198F0K2v18mIjicVzw9IQVKJIc4j9qdNPamUKCj4te c+N3XGkQ6TqD+I8fjeaaalYXAzxkdJT31JS/AhECqSz0maYqRocygIOIw6gXjeLz5u1r r0i4Q1+5xy3ceNXHODYoyCmaNo81w3qSFhGV6qb9gpi/U5AR8GYRuYflIIQ6vxmcmUTS b67hf0XoHbrAlUbIdZicirYwUzCyRwbbFaWTnE5ABVczctxmOqPGB0vZpJYClGNiWRvf 7USQ== X-Gm-Message-State: AOAM533JRZN6w9qVQREAE8+8U7XNkmsrmbcYbJIu58h+Ke7/g+9R2QF5 BO+YVUKEh+z3l9YohKkH3BoeC65TvzswIomE3uDFyQ== X-Google-Smtp-Source: ABdhPJx+rpq4HSXSp6jfp7UQ0J9hdUAfM226zfK6hZLavZmabddYLhfL+ajhRe1PyVE3+Be8kXbBeehdncaxRpDO7es= X-Received: by 2002:a5d:9051:: with SMTP id v17mr33836994ioq.81.1625967721832; Sat, 10 Jul 2021 18:42:01 -0700 (PDT) MIME-Version: 1.0 References: <20210709234054.10288-1-olof@lixom.net> <20210709234054.10288-2-olof@lixom.net> In-Reply-To: From: Olof Johansson Date: Sat, 10 Jul 2021 18:41:50 -0700 Message-ID: Subject: Re: [GIT PULL 2/4] ARM: Devicetree material for 5.14 To: Linus Torvalds List-Id: Cc: ARM SoC , SoC Team , Linux Kernel Mailing List , Linux ARM X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210710_184203_762520_8F338817 X-CRM114-Status: GOOD ( 17.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Message-ID: <20210711014150.wiA1uMtOTIgbYK8kIosDsGfyImlUJU115sPrCuzI4ps@z> On Sat, Jul 10, 2021 at 9:45 AM Linus Torvalds wrote: > > What? > > My shortlog matches yours, but my diffstat isn't even close. > > You show 554 commits, but then your diffstat as not a single file from > arch/arm*/boot/dts, and says: > > On Fri, Jul 9, 2021 at 4:41 PM Olof Johansson wrote: > > > > 97 files changed, 8428 insertions(+), 5174 deletions(-) > > while mine is very different indeed: > > 552 files changed, 24060 insertions(+), 3691 deletions(-) > > I suspect you got the diffstat from something else entirely, because > mine looks a lot more believable and matches the commits listed in the > shortlog a lot better.. Yeah, this was an operator error at my end due to the workflow I have when I generate the pull requests. Thanks for noticing, and as you saw on the 3rd branch, the info was swapped between them. For more detail in case anyone is interested: I merge the set of pull requests one by one on top of your branch, and then run a script that generates the pull requests. At least when we started out, git request-pull got confused and generated wrong info when we had complex merges. This time around I generated them backwards: Merged all 4, then generated the last pull request email, reset back to the next head (with the previous branch), generated that, etc. The mistake here is that I mixed up the order of the two middle ones. So I specified the tag (and got the commit message from it), but obviously the diffstats and the shortlogs ended up generated from what was in the working tree, i.e. the other branch. My bad, and something I'll double check for in the future or add a sanity-check for in the script. -Olof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel