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=-6.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3753EC07E99 for ; Fri, 9 Jul 2021 16:51:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B880613BF for ; Fri, 9 Jul 2021 16:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229662AbhGIQyI (ORCPT ); Fri, 9 Jul 2021 12:54:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbhGIQyH (ORCPT ); Fri, 9 Jul 2021 12:54:07 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2809DC0613E5 for ; Fri, 9 Jul 2021 09:51:24 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id p1so24425762lfr.12 for ; Fri, 09 Jul 2021 09:51:24 -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=POScCYO3L5Ni7K5IJDMuBcM7y+WItrME8kkxfvws3ek=; b=EU9r8vWEoGkrd+oqDc3JWjks89a7hhBpvolnGLsELcbw9Mngci6v80+RhlCzO/9AuJ 6y4vqC5jmWJIR3TGTQPajSJ+RDQ79o+gDU/OXoYJEEi5kNfzsC4wkJef/dYIjwbAebTc NQhsy0KfaPm+ob3cOAdYCFnxPDMPTYrSeg8gM= 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=POScCYO3L5Ni7K5IJDMuBcM7y+WItrME8kkxfvws3ek=; b=NNuTvaHjIVVxkKaAFgvjidBlH4qqJyU9RU4cJRJKSs+B8EJmGNL+pGguBlWlcmlNMR HpqseLV9MTTEWczOh36VicpJO+qNKr1RKiZwotyBPZciQWSf3oAgtZ8KQEt+Es1d8I9+ nh/aUJNf1BKR4GZcjSjfbBDjA21Yr7c8Eqz63G6Xa9SjVx+clUn++zw2HU7jhekIqjEE 5xx+M+Sk1u2GtRVf/wECTeqSd4gkbJxXPCNSCWCwPPJQzKhJvOrvB4NnuWoONc5LCkSJ X2tW99/5k5OnCiRpHntRMIUAaH/sAAphYg2KOd4H2vE9zlfuRfGL7OEEe8s/AXVydAID znwg== X-Gm-Message-State: AOAM531uANCB0sWR6YTF1d+G0Kds2/WtizzexlJaJ+pVNgf5qg+GJwAK cnoQNOffXOwYfrPtGVYlZ9VwoZcS5oteGC1uYcE= X-Google-Smtp-Source: ABdhPJwE1Racd3BB/dDjQlurk4sgBtHrr7Y6HGtHfxhcKApjfl/piwJjQFvmP2FnJW0f5RtwORRAiw== X-Received: by 2002:ac2:4356:: with SMTP id o22mr30682004lfl.309.1625849482335; Fri, 09 Jul 2021 09:51:22 -0700 (PDT) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com. [209.85.208.170]) by smtp.gmail.com with ESMTPSA id d12sm504190lfv.204.2021.07.09.09.51.21 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Jul 2021 09:51:21 -0700 (PDT) Received: by mail-lj1-f170.google.com with SMTP id s18so9012128ljg.7 for ; Fri, 09 Jul 2021 09:51:21 -0700 (PDT) X-Received: by 2002:a2e:a276:: with SMTP id k22mr29161691ljm.465.1625849481318; Fri, 09 Jul 2021 09:51:21 -0700 (PDT) MIME-Version: 1.0 References: <6809750d3e746fb0732995bb9a0c1fa846bbd486.camel@hammerspace.com> In-Reply-To: <6809750d3e746fb0732995bb9a0c1fa846bbd486.camel@hammerspace.com> From: Linus Torvalds Date: Fri, 9 Jul 2021 09:51:05 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] Please pull NFS client changes for 5.14 To: Trond Myklebust Cc: "linux-nfs@vger.kernel.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 8, 2021 at 11:16 AM Trond Myklebust wrote: > > Please note that this branch was rebased today. The reason was I discovered > that one of the topic branches that was merged contained some duplicated patches > from the main branch (mea culpa). So the rebase simply removed those duplicates > from the topic branch. Please don't rebase just for pointless details like this. Duplicate patches aren't a problem, and we have them all the time. Yes, they can cause annoying merge conflicts (not on their own - identical patches will merge just fine - but if there are then *other* changes to the same area). But it's seldom all that big of a deal, and if there's just a couple of duplicates, then rebasing is much _worse_ than the fix. If there were *tons* of duplicate patches, and you have some workflow issue, that's one thing - and then you need to fix the workflow. But particularly for just a couple of patches, rebasing and losing all the testing is really entirely the wrong thing to do. In other words: only rebase for *catastrophic* stuff. Only yo fix things that are actively broken. Not for some minor technical issue. I've pulled this, but please avoid this in the future. Linus