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=-5.8 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 991E0C433DB for ; Mon, 11 Jan 2021 06:56:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56A7A206A3 for ; Mon, 11 Jan 2021 06:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726626AbhAKG4j (ORCPT ); Mon, 11 Jan 2021 01:56:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:48602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbhAKG4j (ORCPT ); Mon, 11 Jan 2021 01:56:39 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 17A23206A3; Mon, 11 Jan 2021 06:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1610348158; bh=MnoY6HKjvx2onhwcFSa4eVbWmXuTQi7IxeR2WTukIUU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Cx7CgQ58xD7qCuF78UAL8tL2wo76n4OSRQ3qMtFmnMolPmU8OnymQNE5hFSD8HPTS 1sn8dB1i/cdB/Sj5CDWTQxOOtQXBRYvQi2Vp1cHMZHCdXz7ntXyfl5t148ChoMtn86 I8+0LqB7+KL3zAjId+oHv0qwSlvd2E7Cq56oOIjM= Date: Mon, 11 Jan 2021 07:57:10 +0100 From: Greg KH To: Tom Rix Cc: Moritz Fischer , "linux-fpga@vger.kernel.org" , linux-kernel@vger.kernel.org, moritzf@google.com, Rikard Falkeborn , Zheng Yongjun , Russ Weight , "Gerlach, Matthew" , Sonal Santan , Xu Yilun , Richard Gong Subject: Re: [PATCH 0/8] FPGA DFL Changes for 5.12 Message-ID: References: <20210107043714.991646-1-mdf@kernel.org> <80b29715-aa0a-b2ac-03af-904fc8f8be98@redhat.com> <95af46d6-d123-f610-2f21-6d6de6f248e9@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <95af46d6-d123-f610-2f21-6d6de6f248e9@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org On Sun, Jan 10, 2021 at 11:43:54AM -0800, Tom Rix wrote: > > On 1/10/21 9:05 AM, Moritz Fischer wrote: > > Tom, > > > > On Sun, Jan 10, 2021 at 07:46:29AM -0800, Tom Rix wrote: > >> On 1/7/21 8:09 AM, Tom Rix wrote: > >>> On 1/6/21 8:37 PM, Moritz Fischer wrote: > >>>> This is a resend of the previous (unfortunately late) patchset of > >>>> changes for FPGA DFL. > >>> Is there something I can do to help ? > >>> > >>> I am paid to look after linux-fpga, so i have plenty of time. > >>> > >>> Some ideas of what i am doing now privately i can do publicly. > >>> > >>> 1. keep linux-fpga sync-ed to greg's branch so linux-fpga is normally in a pullable state. > > Is it not? It currently points to v5.11-rc1. If I start applying patches > > that require the changes that went into Greg's branch I can merge. > > I mean the window between when we have staged patches and when they go into Greg's branch. > > We don't have any now, maybe those two trival ones. > > Since Greg's branch moves much faster than ours, our staging branch needs to be rebased regularly until its merge. Ick, no! NEVER rebase a public branch. Why does it matter the speed of my branch vs. anyone elses? Git handles merges very well. Just like Linus's branches move much faster than mine, and I don't rebase my branches, you shouldn't rebase yours. Becides, I'm only taking _PATCHES_ for fpga changes at the moment, no git pulls, so why does it matter at all for any of this? What is the problem you are trying to solve here? thanks, greg k-h