From: Paul Moore <paul@paul-moore.com>
To: linux-audit@redhat.com
Subject: Changes to the git repository
Date: Thu, 23 Apr 2015 17:05:01 -0400 [thread overview]
Message-ID: <4212319.pRd1rSbgdC@sifl> (raw)
Hello All,
A quick update on some changes to the git repository: we've reached that point
in time where we need to resync with Linus to catch all the upstream changes
that have been occurring since we last rebased the audit tree. In a perfect
world I would have realized this before I sent the v4.1 pull request to Linus
and rebased audit#upstream before merging in audit#next, but we did not live
in a perfect world as evidenced by the fact that you have this yahoo looking
after the audit tree :)
So ... here is what we're going to do, my apologies in advance if this causes
you some porting headaches (if it does, let me know and we'll try to work
something out):
[NOTE: a few slight tweaks to our normal process for this round of branch
rotations only, after this we will resume our normal operation]
1. Create a new stable branch, stable-4.1, set to audit#upstream at the time
of the v4.1 pull request.
2. Reset the next branch to v4.0.
3. Accept new features into the next branch and fixes into the stable-4.1
branch.
4. As necessary, merge stable-4.1 into upstream and send pull requests
upstream.
5. When v4.1 is released, reset upstream to v4.1, merge audit#next into
upstream and send a pull request for the upstream branch.
6. Resume normal operation.
If you've got any questions, let me know.
-Paul
--
paul moore
www.paul-moore.com
reply other threads:[~2015-04-23 21:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4212319.pRd1rSbgdC@sifl \
--to=paul@paul-moore.com \
--cc=linux-audit@redhat.com \
/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).