Re: [Keyrings] [PATCH 0/6] Keys: Key management updates [try #3]

[Andrew Morton <akpm@osdl.org>]

On Tue, 20 Jun 2006 16:44:16 -0400 (EDT)
James Morris <jmorris@namei.org> wrote:

> On Tue, 20 Jun 2006, David Howells wrote:
> 
> > These patches update a few key management related things, mainly security
> > related.  They have the following prerequisite patches from Andrew Morton's -mm
> > tree:
> > 
> > 	selinux-add-hooks-for-key-subsystem.patch
> > 	keys-fix-race-between-two-instantiators-of-a-key.patch
> 
> When do you think these patches will move from -mm into mainline?

I prefer to start the -mm merging in the second week of the merge window,
after the git trees have gone.

a) because that's the order in which the patches are staged

b) because that's the way in which they were tested: -mm patches without
   the presence of the git trees is basically untested code.

c) because I'm more able to handle rejects and other such crap than git
   victims^Wusers.

But sometimes I get bored and merge stuff early anyway.

> I ask because I've got a bunch of SELinux patches lined up behind this 
> patchset, which we're aiming for 2.6.18 inclusion.

OK, I'll move those two up into the i-got-bored batch, aim for tomorrow.