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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D640C433F5 for ; Tue, 24 May 2022 17:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239900AbiEXRRZ (ORCPT ); Tue, 24 May 2022 13:17:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237636AbiEXRRX (ORCPT ); Tue, 24 May 2022 13:17:23 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66536674D5 for ; Tue, 24 May 2022 10:17:22 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id jx22so23257945ejb.12 for ; Tue, 24 May 2022 10:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=cBTU2d6LGQrA5UpdUI+q3+50Xb8LpHmYsGQdgFJYs7M=; b=Uje0i8noryWRQJ71UJNPcNr9SvuycxHpNv/YSo1Ph76D8OFKHwqsfeSV0OGq1Q4Mp3 Ov9LU7DAcbOfjlfOw97Yzx7lF1wOJbOjjlHPDLfdbXTnpUXOtmCO2tSxVqLjKVPugaS+ S4MP2x6uEactrqw7yUUlMJvqyEuXmgMdMnPas= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=cBTU2d6LGQrA5UpdUI+q3+50Xb8LpHmYsGQdgFJYs7M=; b=xK221wIj0iGbNVri+6nQ+TPv0uQKfe39BQsDZ59RTgbZBHOq1aVp45WLjUmogmRoYf gVfwsUKKyTdtzH0YgYGJ6NsGbuXSv5E86CJl3XLLSkAw+TJtlidhOQ/JGToRliEPgLCh opzHxEKhQ79327tAXAzJ+t2hgfkJ7PIMa72IWN/7ft1Lyb90j/fQQLaFWRYCBhrDpWu7 k/g7NB3cAHX+z2CRgm4mlIjcruvlCEIku9W7zevGQC0iuyrFUv8sfDndZcloKbBYrnVj 5cGqkPMHSkEl3egbVSNSxQFv/aZ7cn/4NviOTg/9y/BE5Smp6p3Fbx1OPrU5EVcQHTWD P4Xg== X-Gm-Message-State: AOAM531LXjU/jfDeVHW/6yZimhIvaAYAEup5UPsZkY6MGxyROgeYGmnK 0K6zIXfFSUKBb+x8PRgsT530TQp6doLCFUaw X-Google-Smtp-Source: ABdhPJwCbnYGjHaixSVkUWc1lcgFAbhG+YlpeIdxeQn6zTJsIptaJkdAlykRx56/bhYICXTcdDvgQw== X-Received: by 2002:a17:907:a088:b0:6f4:f661:f77a with SMTP id hu8-20020a170907a08800b006f4f661f77amr25358121ejc.77.1653412640611; Tue, 24 May 2022 10:17:20 -0700 (PDT) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com. [209.85.221.47]) by smtp.gmail.com with ESMTPSA id 14-20020a17090601ce00b006f3ef214db6sm7317893ejj.28.2022.05.24.10.17.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 May 2022 10:17:20 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id j25so2222993wrb.6 for ; Tue, 24 May 2022 10:17:19 -0700 (PDT) X-Received: by 2002:a5d:59ac:0:b0:20e:6fd6:88c1 with SMTP id p12-20020a5d59ac000000b0020e6fd688c1mr21668342wrr.442.1653412639620; Tue, 24 May 2022 10:17:19 -0700 (PDT) MIME-Version: 1.0 References: <13e61c61-0d4b-5f48-6373-f056bf8b603f@redhat.com> In-Reply-To: From: Linus Torvalds Date: Tue, 24 May 2022 10:17:03 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] platform-drivers-x86 for 5.19-1 To: Hans de Goede Cc: Andy Shevchenko , Mark Gross , LKML , Thomas Gleixner , "Peter Zijlstra (Intel)" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 23, 2022 at 11:47 PM Hans de Goede wrote: > > I did do a "git remote update origin" recently (recent-ish), but > AFAIK that does not help. Hmm. Did you pass in 'origin' to git request-pull too? > I did read somewhere that in cases like this some maintainers > create a branch with a merge of their for-next branch [..] No, that's only necessary for when the branch has merges and can have multiple merge bases as a result - that will make 'git diff' unable to find an unambiguous place to start the diff from (see Documentation/maintainer/messy-diffstat.rst for the details). But your tree doesn't have that issue, and you can also see the old commits in your shortlog (and the "messy diffstat" is _only_ about the diff, not about the commit list). And you can see the same effect in the shortlog, ie I merged your earlier fixes pull request in commit 9be9ed2612b5 ("Merge tag 'platform-drivers-x86-v5.18-4' of git://..."), and it already had * tag 'platform-drivers-x86-v5.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/pla> platform/surface: aggregator: Fix initialization order when compiling as builtin module platform/surface: gpe: Add support for Surface Pro 8 platform/x86/intel: Fix 'rmmod pmt_telemetry' panic platform/x86: thinkpad_acpi: Correct dual fan probe platform/x86: thinkpad_acpi: Add a s2idle resume quirk for a number of laptops platform/x86: thinkpad_acpi: Convert btusb DMI list to quirks but notice how your pll request had those commits listed again (ie it had, for example: Maximilian Luz (2): platform/surface: gpe: Add support for Surface Pro 8 platform/surface: aggregator: Fix initialization order when compiling as builtin module in there). And while merges can confuse the diffstat, the actual commit list doesn't care: it does a proper set operation, and having multiple merge bases doesn't matter. This all is not a huge deal - I figured out what was going on, so it wasn't a problem. I just mentioned it because that whole "Linus figures it out" does take some time and effort, and I'm really really lazy and much prefer to just do the pull and look at the result and go "Yeah, looks good" and go on to the next one... Thanks, Linus