Changes to the git repository

Paul Moore paul at paul-moore.com
Thu Apr 23 21:05:01 UTC 2015


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




More information about the Linux-audit mailing list