All of lore.kernel.org
 help / color / mirror / Atom feed
From: greg@kroah.com (Greg KH)
To: kernelnewbies@lists.kernelnewbies.org
Subject: question about staging tree branches
Date: Tue, 12 Jul 2011 18:01:07 +0200	[thread overview]
Message-ID: <20110712160107.GC6696@kroah.com> (raw)
In-Reply-To: <CAD6i1fKRqhT-GKfZfqsFrEkqLuDytmxANPrd-EG=WoqBOm-iqA@mail.gmail.com>

On Tue, Jul 12, 2011 at 12:15:17PM +0530, Prashant Shah wrote:
> Hi,
> 
> There are 4 branches in the staging tree
> 
>   remotes/staging/master
>   remotes/staging/ralink
>   remotes/staging/staging-linus
>   remotes/staging/staging-next
> 
> Is the staging-linus is what Linus merges and staging-next is merged
> by linux-next tree ?

No, staging-linus is what goes to Linus for this kernel release, after
the -rc1 kernel is out.  It is picked up in the linux-next daily
releases.

staging-next is what goes to Linus for the next kernel release after
this one.  It too is picked up in the linux-next daily releases.

ralink is an old branch of mine that I need to delete that has an
obsolete ralink driver in it that I was working on cleaning up.  Anyone
remember what the command to delete a remote branch is?  I always need
to look it up...

And master tracks Linus's branch.

Hope this helps,

greg k-h

  reply	other threads:[~2011-07-12 16:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-12  6:45 question about staging tree branches Prashant Shah
2011-07-12 16:01 ` Greg KH [this message]
2011-07-12 16:34   ` Daniel Baluta
2011-08-23 23:14     ` Greg KH

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=20110712160107.GC6696@kroah.com \
    --to=greg@kroah.com \
    --cc=kernelnewbies@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.