From: Casey Schaufler <casey@schaufler-ca.com>
To: Paul Moore <paul@paul-moore.com>, James Morris <jmorris@namei.org>
Cc: linux-security-module@vger.kernel.org,
James Morris <james.l.morris@oracle.com>,
selinux@tycho.nsa.gov
Subject: Re: [GIT PULL] SELinux patches for 4.1
Date: Fri, 24 Apr 2015 09:20:13 -0700 [thread overview]
Message-ID: <553A6D3D.8020904@schaufler-ca.com> (raw)
In-Reply-To: <CAHC9VhTGXTRi0=XbeB8b+LQVC+MDdk3PH38hYSafmV5CMrvi8Q@mail.gmail.com>
On 4/24/2015 7:53 AM, Paul Moore wrote:
> On Thu, Apr 23, 2015 at 8:24 PM, James Morris <jmorris@namei.org> wrote:
>> On Thu, 23 Apr 2015, Paul Moore wrote:
>>
>>> On Sun, Apr 12, 2015 at 9:46 PM, James Morris <jmorris@namei.org> wrote:
>>>> On Wed, 8 Apr 2015, Paul Moore wrote:
>>>>
>>>>> On Wed, Apr 8, 2015 at 6:57 AM, James Morris <jmorris@namei.org> wrote:
>>>>>> On Mon, 6 Apr 2015, Paul Moore wrote:
>>>>>>
>>>>>>> Removed the patch, it should now just contain the five patches described at
>>>>>>> the start, and shown again below. It's based again the current security#next
>>>>>>> branch so there should be no problems, at least there haven't been in my test
>>>>>>> pulls.
>>>>>> Ok, I'll pull it on the weekend when I get back from PTO.
>>>>> Okay, thanks. When you get back I'd still be curious to hear how you
>>>>> manage the security tree; my process works *ok* but I'm always looking
>>>>> for new approaches that may work better.
>>>> Currently I merge my next branch with Linus at -rc1 or -rc2, after
>>>> experimenting with other approaches. I pull into that from security
>>>> subsystems and push to Linus during the merge window. Do you need any
>>>> more info? Not sure what else there is to add.
>>>>
>>>> For urgent fixes, I branch from Linus current (e.g. for-linus) and use
>>>> that to push to Linus. This is a volatile branch which should not be
>>>> tracked.
>>> So no long running branches then? You simply recreate your next
>>> branch every release?
>> The next branch is long running.
> I guess I misunderstood your merge with -rc1/-rc2 comment, I thought
> you meant you rebased at each -rc1/-rc2.
>
James, do you suppose you could send an announcement when you
do your merge? That would make it easier on the sub-tree maintainers.
Just a quick "I merged the next branch to XXXX" to the LSM list.
next prev parent reply other threads:[~2015-04-24 16:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 2:49 [GIT PULL] SELinux patches for 4.1 Paul Moore
2015-04-02 12:32 ` James Morris
2015-04-02 21:18 ` Paul Moore
2015-04-03 2:45 ` James Morris
2015-04-03 9:04 ` Paul Moore
2015-04-03 15:07 ` James Morris
2015-04-03 22:22 ` Paul Moore
2015-04-04 0:49 ` James Morris
2015-04-04 2:36 ` Paul Moore
2015-04-05 23:14 ` James Morris
2015-04-06 12:48 ` Paul Moore
2015-04-06 14:04 ` James Morris
2015-04-06 14:09 ` James Morris
2015-04-07 0:43 ` Paul Moore
2015-04-08 10:57 ` James Morris
2015-04-08 11:04 ` Paul Moore
2015-04-13 1:46 ` James Morris
2015-04-23 22:06 ` Paul Moore
2015-04-24 0:24 ` James Morris
2015-04-24 14:53 ` Paul Moore
2015-04-24 16:20 ` Casey Schaufler [this message]
2015-04-26 21:22 ` Paul Moore
2015-04-27 5:28 ` James Morris
2015-04-28 23:53 ` Mimi Zohar
2015-05-02 15:03 ` secilc bug Dominick Grift
2015-05-03 10:50 ` Dominick Grift
2015-05-04 15:19 ` James Carter
2015-05-04 15:33 ` Steve Lawrence
2015-05-04 15:44 ` Dominick Grift
2015-05-04 15:46 ` Dominick Grift
2015-05-04 15:37 ` Dominick Grift
2015-08-03 19:21 ` Dominick Grift
2015-04-27 5:28 ` [GIT PULL] SELinux patches for 4.1 James Morris
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=553A6D3D.8020904@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=james.l.morris@oracle.com \
--cc=jmorris@namei.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--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.