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 F1AB7C3A5A6 for ; Thu, 19 Sep 2019 16:30:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C783A21928 for ; Thu, 19 Sep 2019 16:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568910601; bh=hfOdejTij4NFFJSYrAJTC2F7rEEcEPn3fXAZhkO5Ijs=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=0wIzpPTrY5EVzVn2dJzQ6FRUnxJv99DJA28VD8BCaGqSgrGCV8uvhZBq9uLVzySI7 Zenpgue1Ps6tYh2Od8w48MDcAIp77A8Cs16J5reYzcKp2mGX949SV7biEpdTTA7TQX czkRg2dMfWr6YCncFGUEKTQSFZBmAlMtLSd2Lqx4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404349AbfISQaA (ORCPT ); Thu, 19 Sep 2019 12:30:00 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:41595 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387693AbfISQ37 (ORCPT ); Thu, 19 Sep 2019 12:29:59 -0400 Received: by mail-lj1-f196.google.com with SMTP id f5so4232379ljg.8 for ; Thu, 19 Sep 2019 09:29:58 -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=BkzE/Iez2Ai/D2d7otfchCvT/gVk3ql55ptNkLRgddG3dRZ1nWtuzKGMmmX575J6yw JHWQ/n2Rfg6yjtcPLeod2dm3E6vhjhqbfpFbv5q6mfh2gWXncgdkHwThzEvFDMl/t/cw RVGoLUAfClTLqLvUoBd0oRgosUpu9F5O0VqDOkqn7lEZwC8ccxWfZZ/ZyxFbIyd9nK2u qTbmNnRZWQiLPazfeQdN6lQ8wC+Os/aBFHCRTtwaWvTTIcVh1+uiQ8XEuXrpDbiMXsZK SulMfZKZce6JvT6tiwRIu2bOt+BV1KRS6aFMFTSNrIB6SZSwLVrDnT6/EKr4iwys2FOD jZnQ== X-Gm-Message-State: APjAAAXcBrgtt5TU78ety84Vp0yuuKnYxxyMykfHFPzlX8qq+b1baZ0m VLIf58OVcttlCd6X2/yCF/sfnJo5png= X-Google-Smtp-Source: APXvYqziCVHgk9Xvv4xU6KySYpfYwucdlOJ/1D9lYCNXLXi9sFE0008yLvt+oPT4IylbfQWn2K7LEQ== X-Received: by 2002:a2e:9059:: with SMTP id n25mr1584467ljg.134.1568910596792; Thu, 19 Sep 2019 09:29:56 -0700 (PDT) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com. [209.85.208.169]) by smtp.gmail.com with ESMTPSA id b67sm1786868ljf.5.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-f169.google.com with SMTP id 7so4233355ljw.7 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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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