From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Subject: Changes to the git repository Date: Thu, 23 Apr 2015 17:05:01 -0400 Message-ID: <4212319.pRd1rSbgdC@sifl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3NL54it015831 for ; Thu, 23 Apr 2015 17:05:04 -0400 Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3NL52Ik014828 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 23 Apr 2015 17:05:03 -0400 Received: by qcyk17 with SMTP id k17so16219280qcy.1 for ; Thu, 23 Apr 2015 14:05:02 -0700 (PDT) Received: from sifl.localnet (c-76-119-162-148.hsd1.nh.comcast.net. [76.119.162.148]) by mx.google.com with ESMTPSA id i91sm6752665qgd.46.2015.04.23.14.05.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Apr 2015 14:05:02 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: linux-audit@redhat.com List-Id: linux-audit@redhat.com 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