[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.1.10.0810070847480.4113@tundra.namei.org>
Date: Tue, 7 Oct 2008 08:50:15 +1100 (EST)
From: James Morris <jmorris@...ei.org>
To: "Serge E. Hallyn" <serue@...ibm.com>
cc: David Howells <dhowells@...hat.com>, Andrew Morton <akpm@...l.org>,
Linux Containers <containers@...ts.osdl.org>,
lkml <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/3] user namespaces: introduce user_struct->user_namespace
relationship
On Mon, 6 Oct 2008, Serge E. Hallyn wrote:
> Quoting James Morris (jmorris@...ei.org):
> > On Fri, 3 Oct 2008, Serge E. Hallyn wrote:
> >
> > > Hi James,
> > >
> > > here are 3 patches to fix up the user namespaces a bit in preparation
> > > for real userns work to begin. Andrew had suggested that these be
> > > rebased on top of your -next tree because they will conflict with
> > > the credentials work. But it looks like much of the credentials stuff
> > > isn't in your next branch. If you'd prefer that I port these to
> > > creds-next, please let me know. I'll have to do it eventually :)
> >
> > creds-next is dead.
> >
> > Code ready for the next merge window is in the 'next' branch, while the
> > current creds code is in the 'creds-next-subsys' branch, which hasn't been
> > picked up in linux-next yet because of LPC and sfr's vacation.
> >
> > When do you expect these patches to be sent upstream? Are they ready now
> > as an incremental change for 2.6.27?
>
> Oh I'm not trying to get them into 2.6.28, I'm just trying to get them
> more widely tested, hopefully aiming for 2.6.29. They have been stable
> in all of my tests, and the last patch fixes a real (behavioral - not
> oops-inducing) bug in the current code, but I'm trying to figure out
> which path they should take.
I suggest feeding them into linux-next directly until you want them merged
with another tree. Are there known clashes with the creds work? If so,
the fixups could be carried in linux-next, or generate them against
creds-next-subsys for inclusion after that.
--
James Morris
<jmorris@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists