kernelnewbies.kernelnewbies.org archive mirror
 help / color / mirror / Atom feed
From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Jonathan Bergh <bergh.jonathan@gmail.com>
Cc: kernelnewbies@kernelnewbies.org
Subject: Re: Which tree to track: linux-next or staging?
Date: Mon, 11 Mar 2024 09:56:06 -0400	[thread overview]
Message-ID: <20240311-nostalgic-utopian-dragon-b637cd@lemur> (raw)
In-Reply-To: <CA+MPq=Xp9eqJ-88MdPdhwQUSK0fk11HNKDCUqj6yRMFau0krgQ@mail.gmail.com>

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

  reply	other threads:[~2024-03-11 14:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-09 14:49 Which tree to track: linux-next or staging? Jonathan Bergh
2024-03-11 13:56 ` Konstantin Ryabitsev [this message]
2024-03-11 18:48   ` Jonathan Bergh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240311-nostalgic-utopian-dragon-b637cd@lemur \
    --to=konstantin@linuxfoundation.org \
    --cc=bergh.jonathan@gmail.com \
    --cc=kernelnewbies@kernelnewbies.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).