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 shelob.surriel.com (shelob.surriel.com [96.67.55.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F8F8C5475B for ; Mon, 11 Mar 2024 14:09:04 +0000 (UTC) Received: from localhost ([::1] helo=shelob.surriel.com) by shelob.surriel.com with esmtp (Exim 4.97.1) (envelope-from ) id 1rjg9k-000000006j8-1KQ4; Mon, 11 Mar 2024 09:57:32 -0400 Received: from sin.source.kernel.org ([145.40.73.55]) by shelob.surriel.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1rjg9Z-000000006h5-1AdP for kernelnewbies@kernelnewbies.org; Mon, 11 Mar 2024 09:57:26 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 3D450CE0F54; Mon, 11 Mar 2024 13:56:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D11CC433F1; Mon, 11 Mar 2024 13:56:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1710165369; bh=atEEIQPA3J1vJEHcLtNQTeat1O/Oaoq2B6jBswz99k0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XyeTwrRFq5MhhlzNp7C4xlNFHiqpQJpO4l8bKpUuGdUbDLkRqCLkOhaxgLGABGTYK W6Pp2EV4T63bU9nDZOcOTmffrCTW7iobLsrVtO/rHSi+5Q68nBaXFZWFkKpddCnBR1 pYIGB+bFlErpcPyyCzue36tkG0LmNHK3IOTUG/3Y= Date: Mon, 11 Mar 2024 09:56:06 -0400 From: Konstantin Ryabitsev To: Jonathan Bergh Subject: Re: Which tree to track: linux-next or staging? Message-ID: <20240311-nostalgic-utopian-dragon-b637cd@lemur> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Cc: kernelnewbies@kernelnewbies.org X-BeenThere: kernelnewbies@kernelnewbies.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Learn about the Linux kernel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kernelnewbies-bounces@kernelnewbies.org On Sat, Mar 09, 2024 at 03:49:15PM +0100, Jonathan Bergh wrote: > I have had the opportunity to submit a few patches, which has been > really fun. However, a while back i submitted patches for fixes that i > realised after had already been patched in GregKH tree ... and i > realised i had been developing against Linus's master branch, and not > linux-next. > > But my question is, is it better to develop against linux-next or in > newbies cases, one of GregKH's (staging) branches? Maybe > staging/master or staging/staging-next? There is no hard and fast rule about it, but in general: - if you are closely working with a particular subsystem, the best course of action is to develop against the indicated tree/branch (e.g. see T: entries in the MAINTAINERS file); you should rebase your series to the latest before sending it off to the maintainer - if you are an occasional contributor, you should use either the latest next tag for submitting your patches, or the latest mainline tag - if you are sending a one-off patch, basing it off of the latest mainline tag is just fine With any of these approaches you *will* occasionally have a mid-air collision with someone else -- it's just a reality when it comes to distributed workflows. -K _______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies