All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Moore <pmoore@redhat.com>
To: selinux@tycho.nsa.gov
Cc: linux-security-module@vger.kernel.org
Subject: SELinux tree updates
Date: Fri, 05 Jun 2015 14:40:01 -0400	[thread overview]
Message-ID: <9892603.2N9PhGGyoM@sifl> (raw)

Hello All,

While I try to keep rebases to the SELinux tree at a minimum, they are 
occasionally necessary to sync with upstream development; Casey's LSM stacking 
patches merit a rebase.  You may have noticed this starting yesterday, but in 
case you haven't, this serves as notice that I've rebased the SELinux upstream 
and next branches.  I apologize for any inconvenience this may have caused.  
Once Linux 4.1 is released, I will resume my usual process of updating the 
SELinux tree (described below).

* SELinux Tree
  -> git://git.infradead.org/users/pcmoore/selinux
  -> http://git.infradead.org/users/pcmoore/selinux

* SELinux Tree Process

  1. Create a new branch, stable-X.XX, set to the upstream branch that
  was sent during the merge window.

  2. Reset the next branch to the upstream branch that was sent during
  the merge window.

  3. Accept new features into the next branch and fixes into the
  stable-X.XX branch.

  4. As necessary, merge stable-X.XX into upstream and send pull
  requests upstream.

  5. When vX.XX is released, merge next into upstream and send a pull
  request for the upstream branch.  Leave stable-X.XX untouched for
  future stable fixes.

  6. Goto step #1.

-- 
paul moore
security @ redhat

             reply	other threads:[~2015-06-05 18:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-05 18:40 Paul Moore [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-10 21:45 SELinux tree updates Paul Moore

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=9892603.2N9PhGGyoM@sifl \
    --to=pmoore@redhat.com \
    --cc=linux-security-module@vger.kernel.org \
    --cc=selinux@tycho.nsa.gov \
    /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.