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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,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 39E29C3A5A6 for ; Thu, 19 Sep 2019 16:30:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A66A20644 for ; Thu, 19 Sep 2019 16:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568910600; bh=hfOdejTij4NFFJSYrAJTC2F7rEEcEPn3fXAZhkO5Ijs=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=OW2FCQ/WpKMWMgjVZyXGCW92RrxlrJ/9fmJqyIc3mdqSIhUHzQ7Q0enriKnxg2aex eMpd6757oN9oiyfJMgVEIdag1F/u5EmqaQ18Z5U6SXN+HcuOjaIRdECOdM7D/KMT0u PKQquXoU3Tk9Lg/iOiUVm9fDcVQeNr+GNnsUpiiw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404347AbfISQ37 (ORCPT ); Thu, 19 Sep 2019 12:29:59 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:43147 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387576AbfISQ36 (ORCPT ); Thu, 19 Sep 2019 12:29:58 -0400 Received: by mail-lj1-f194.google.com with SMTP id d5so4203557lja.10 for ; Thu, 19 Sep 2019 09:29:57 -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=yOeYjhY2TaFJW9wyBh4aTYbME8oCFKdq0q4U7z5/glg=; b=fANktzJy2S3Kc/Mm9Tv5QoHvYpucXsOuKEmCGX95UhOvTtrVw5xZLOL8D7SbT7J7zp q+wtuj988DKgYQxlWbNSygEa2IyFNISOALjUyMsG5jZ8BlpqlP7BCkXN9vlUCPzen3oH MZUBRP7j1WuGyLw3Kl49isvHiIAcdB2Y/jIdE= 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=yOeYjhY2TaFJW9wyBh4aTYbME8oCFKdq0q4U7z5/glg=; b=EZNvLgyxluUl5Em6xoMjY72bgdExzhsKIjBah8YyMZAGJgRw6fFDHLOCpvG5QZkcBE QeK1n68vg3+lgaagvuqVkc/nhg+CEE7qNi5tC9KCPTNQHYPd2zi0DqvaK9gnmUxozncR 8rXTaLWYEYFQ+2uK3kgmDKWbjfgoyMjUZScGHdI6BFMB1y06kMHOaYRPgDIH9HJxnZ+o lBUZ1Ts/pbWOeAuPIq6jfkUaXchJafEBvak7INJi4QftdLpAVRHQm32gaA7uYc1pLVpB ZvsSnCi9U02PUGm6DQhyAr9/yLmC1ZdJ9X15F8DC65NTH9zGQTubCFq0T/dtkrLG7MJH swfQ== X-Gm-Message-State: APjAAAVmcfya6R9v7gwC/qxEUBLpqh7wW5B/pIa3RuirpsYHj5WazhFg CHg+x6/pWbTeZGPyQ3ze3P0ef3+zndo= X-Google-Smtp-Source: APXvYqzRwsXvjJcfTGfVnsA5Wd6jNilPHvV+F0EHUknwD6Zg4nTx+N2715P2MB8tKIMyMFK9+m99Sg== X-Received: by 2002:a05:651c:283:: with SMTP id b3mr5921127ljo.25.1568910596608; Thu, 19 Sep 2019 09:29:56 -0700 (PDT) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com. [209.85.208.177]) by smtp.gmail.com with ESMTPSA id 202sm1758851ljf.75.2019.09.19.09.29.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Sep 2019 09:29:55 -0700 (PDT) Received: by mail-lj1-f177.google.com with SMTP id m7so4264898lji.2 for ; Thu, 19 Sep 2019 09:29:55 -0700 (PDT) X-Received: by 2002:a2e:9854:: with SMTP id e20mr6081705ljj.72.1568910595160; Thu, 19 Sep 2019 09:29:55 -0700 (PDT) MIME-Version: 1.0 References: <16147.1568632167@warthog.procyon.org.uk> <28368.1568875207@warthog.procyon.org.uk> <16257.1568886562@warthog.procyon.org.uk> In-Reply-To: <16257.1568886562@warthog.procyon.org.uk> From: Linus Torvalds Date: Thu, 19 Sep 2019 09:29:38 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL afs: Development for 5.4 To: David Howells Cc: YueHaibing , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 19, 2019 at 2:49 AM David Howells wrote: > > Actually, waiting for all outstanding fixes to get merged and then rebasing > might not be the right thing here. The problem is that there are fixes in > both trees: afs fixes go directly into yours whereas rxrpc fixes go via > networking and I would prefer to base my patches on both of them for testing > purposes. What's the preferred method for dealing with that? Base on a merge > of the lastest of those fixes in each tree? If you absolutely *have* to have something from another development tree, that's generally a sign that something is screwed up with the model in the first place, but when it happens, you should make sure that you have a stable point in that development tree. You might ask the upstream developer (ie Davem, in the case of the network tree) what would be a good point, for example. Don't just pick a random "tree of the day". The same very much goes for my tree, btw. You should simply never just pick a random tree of the day as your base for work if you start with my tree. That's true whether you do a merge or just start new development on top of some point, or anything else, for that matter. Generally, you should never merge other peoples code without having them _tell_ you that some particular point is a good thing to merge. Releases are obviously implicitly such points, but generally cross-tree merges need communication (a pull request to upstream is the obvious such communication, but not necessarily the only one: we've had cross-tree development that has involved separate branches and just various synchronization emails between the two groups). Looking at rxrpc in particular - if that is what you were waiting for - it looks more like you should just had an rxrpc branch, and asked David to pull it for the 5.4 merge window. Then you could have used that branch itself, as a starting point, perhaps. Or - better yet, perhaps - merged it into your development tree based on a good AFS starting point, with a *big* merge message explaining what you are merging and why. Right now there is a merge with absolutely no explanation for why the merge exists at all, and with some very non-obvious bases that really look like they are just random points of development for both me and for Davem. Linus