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 E5FDEC5475B for ; Mon, 11 Mar 2024 19:02:45 +0000 (UTC) Received: from localhost ([::1] helo=shelob.surriel.com) by shelob.surriel.com with esmtp (Exim 4.97.1) (envelope-from ) id 1rjkit-000000003re-3Kdw; Mon, 11 Mar 2024 14:50:07 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by shelob.surriel.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.97.1) (envelope-from ) id 1rjkii-000000003pX-0qio for kernelnewbies@kernelnewbies.org; Mon, 11 Mar 2024 14:50:01 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-513298d6859so4465861e87.3 for ; Mon, 11 Mar 2024 11:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710182918; x=1710787718; darn=kernelnewbies.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=PRrtuejKX8rmA4g35F9r4Pf8iIy5wlvcfHBnMEZtHHo=; b=TFHph0m5pI/s9fwusuXoVMkmcPrQpJYcz23DO/8ZfNbhVZJfpVt6xdvCjTLIcyEokl sw4zke95trmt5H+Jq31JUZbRQYnY1+ubG3jwhnPhtPnHN+HvvzzGhdJq2QrC85SsbstS 4AKA9d2FbfxhPCm1GKzm/P04F14Uv+cjngE5G6S4A0+gBS0j9iWxTLqno8XgXwHLAPLN kuEBybh2l+MwL1jUKBiwcmDa59PMo8Iv7xsl4r3C9j/wG+gk3NocGYaJ0VSfp3vYfSZi psDO6OJj5NKqunSyKLF/bIHvBnkahpYPGi55J4k6vyfGmO/9PnpI/lT47Cpmcl/TfUSD bT/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710182918; x=1710787718; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PRrtuejKX8rmA4g35F9r4Pf8iIy5wlvcfHBnMEZtHHo=; b=jE9oPqKvALNQZFiFQ2o0A7nL33Sj/3c/EAbB0OhyaqGb84ywoGvGQDgtiD2VA9ZhCU jVHHtG5E+pTo05W6iMJEQ5hoHHl6qkhb51DEGlThKfI+ImL1WcZfPReGD8LaiAhrT+Jd w6GT5/ghMRcmYd047/TxS9h5j8ck57U+rIdZ2jEhYF+QsrmvGf+qYNvk+M+Uz4Na2mfA wDbij8mB1vjpE9f8Y3Pa5IPiXLf1szSnwoojyp0DRjx1+VW4hRMdX5w6hhCsiLRIDa1m OLbv2eM32z8kSgLgO7lI+nu3eKcuRpWD3LCR7flQNLBHv/TBaucWvcb69ewe9vG5Tkso gXYw== X-Gm-Message-State: AOJu0YxUbBnmb9lxm08F5z6PuhAF/LM5AWe9+/FEc10bhFsQQ895HBst ALxGCAd8CxOq2e8QEA3y0h9ofpP8XWtfEe/dAr+Jnxb3ze/yniBU X-Google-Smtp-Source: AGHT+IGT8jiBIwLVafiNGLh/iSwNkvwfTC7l5YEasOGuGbvcnO1J/u28kG5A5IHg+BnFnZh7p0k14w== X-Received: by 2002:a19:ee13:0:b0:513:1c6e:583e with SMTP id g19-20020a19ee13000000b005131c6e583emr4275809lfb.61.1710182918064; Mon, 11 Mar 2024 11:48:38 -0700 (PDT) Received: from HP-ENVY-Notebook (c83-255-0-123.bredband.tele2.se. [83.255.0.123]) by smtp.gmail.com with ESMTPSA id f28-20020ac2499c000000b00512aa465e2dsm1200916lfl.206.2024.03.11.11.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 11:48:37 -0700 (PDT) Date: Mon, 11 Mar 2024 19:48:35 +0100 From: Jonathan Bergh To: Konstantin Ryabitsev Subject: Re: Which tree to track: linux-next or staging? Message-ID: References: <20240311-nostalgic-utopian-dragon-b637cd@lemur> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240311-nostalgic-utopian-dragon-b637cd@lemur> 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 Mon, Mar 11, 2024 at 09:56:06AM -0400, Konstantin Ryabitsev wrote: > 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 Got it, thanks for that, good advice. > 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