linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* userns tree ready
@ 2008-11-25  0:16 Serge E. Hallyn
  2008-11-25  0:58 ` Stephen Rothwell
  2008-11-25  1:05 ` James Morris
  0 siblings, 2 replies; 6+ messages in thread
From: Serge E. Hallyn @ 2008-11-25  0:16 UTC (permalink / raw)
  To: Stephen Rothwell, David Howells, linux-next

Hi Stephen,

I've created a new userns tree - although the patches are completely
unchanged from before they were pulled along with David's patches.
They apply fine either right after James' security-next tree or at
the end of linux-next.  The tree is at

git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next

like before, and is based on James's security-next tree.

thanks,
-serge

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: userns tree ready
  2008-11-25  0:16 userns tree ready Serge E. Hallyn
@ 2008-11-25  0:58 ` Stephen Rothwell
  2008-11-25  1:05 ` James Morris
  1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-11-25  0:58 UTC (permalink / raw)
  To: Serge E. Hallyn; +Cc: David Howells, linux-next

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

Hi Serge,

On Mon, 24 Nov 2008 18:16:51 -0600 "Serge E. Hallyn" <serue@us.ibm.com> wrote:
>
> I've created a new userns tree - although the patches are completely
> unchanged from before they were pulled along with David's patches.
> They apply fine either right after James' security-next tree or at
> the end of linux-next.  The tree is at
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next
> 
> like before, and is based on James's security-next tree.

Thanks for that, I will merge it in today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: userns tree ready
  2008-11-25  0:16 userns tree ready Serge E. Hallyn
  2008-11-25  0:58 ` Stephen Rothwell
@ 2008-11-25  1:05 ` James Morris
  2008-11-25 14:24   ` Serge E. Hallyn
  1 sibling, 1 reply; 6+ messages in thread
From: James Morris @ 2008-11-25  1:05 UTC (permalink / raw)
  To: Serge E. Hallyn; +Cc: Stephen Rothwell, David Howells, linux-next

On Mon, 24 Nov 2008, Serge E. Hallyn wrote:

> Hi Stephen,
> 
> I've created a new userns tree - although the patches are completely
> unchanged from before they were pulled along with David's patches.
> They apply fine either right after James' security-next tree or at
> the end of linux-next.  The tree is at
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next
> 
> like before, and is based on James's security-next tree.

I can merge this into my tree, although if it breaks, I'll need help from 
you to fix it.


-- 
James Morris
<jmorris@namei.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: userns tree ready
  2008-11-25  1:05 ` James Morris
@ 2008-11-25 14:24   ` Serge E. Hallyn
  2008-11-26  6:21     ` James Morris
  0 siblings, 1 reply; 6+ messages in thread
From: Serge E. Hallyn @ 2008-11-25 14:24 UTC (permalink / raw)
  To: James Morris; +Cc: Stephen Rothwell, David Howells, linux-next

Quoting James Morris (jmorris@namei.org):
> On Mon, 24 Nov 2008, Serge E. Hallyn wrote:
> 
> > Hi Stephen,
> > 
> > I've created a new userns tree - although the patches are completely
> > unchanged from before they were pulled along with David's patches.
> > They apply fine either right after James' security-next tree or at
> > the end of linux-next.  The tree is at
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next
> > 
> > like before, and is based on James's security-next tree.
> 
> I can merge this into my tree, although if it breaks, I'll need help from 
> you to fix it.

Thanks, James.  I don't know which (security-next or linux-next) is more
appropriate, but I think Stephen may have already added it to
Next/Trees.  I'll of course fix any breakages in any case.

thanks,
-serge

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: userns tree ready
  2008-11-25 14:24   ` Serge E. Hallyn
@ 2008-11-26  6:21     ` James Morris
  2008-11-26  6:55       ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: James Morris @ 2008-11-26  6:21 UTC (permalink / raw)
  To: Serge E. Hallyn; +Cc: Stephen Rothwell, David Howells, linux-next

On Tue, 25 Nov 2008, Serge E. Hallyn wrote:

> Quoting James Morris (jmorris@namei.org):
> > On Mon, 24 Nov 2008, Serge E. Hallyn wrote:
> > 
> > > Hi Stephen,
> > > 
> > > I've created a new userns tree - although the patches are completely
> > > unchanged from before they were pulled along with David's patches.
> > > They apply fine either right after James' security-next tree or at
> > > the end of linux-next.  The tree is at
> > > 
> > > git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/userns-2.6#next
> > > 
> > > like before, and is based on James's security-next tree.
> > 
> > I can merge this into my tree, although if it breaks, I'll need help from 
> > you to fix it.
> 
> Thanks, James.  I don't know which (security-next or linux-next) is more
> appropriate, but I think Stephen may have already added it to
> Next/Trees.  I'll of course fix any breakages in any case.

I've now merged your branch above into:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next



-- 
James Morris
<jmorris@namei.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: userns tree ready
  2008-11-26  6:21     ` James Morris
@ 2008-11-26  6:55       ` Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2008-11-26  6:55 UTC (permalink / raw)
  To: James Morris; +Cc: Serge E. Hallyn, David Howells, linux-next

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

Hi James, Serge,

On Wed, 26 Nov 2008 17:21:21 +1100 (EST) James Morris <jmorris@namei.org> wrote:
>
> I've now merged your branch above into:
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

I will remove it completely from linux-next tomorrow and leave you two to
keep it up to date between yourselves.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-11-26  6:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-25  0:16 userns tree ready Serge E. Hallyn
2008-11-25  0:58 ` Stephen Rothwell
2008-11-25  1:05 ` James Morris
2008-11-25 14:24   ` Serge E. Hallyn
2008-11-26  6:21     ` James Morris
2008-11-26  6:55       ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).