Re: linux-next: manual merge of the userns tree with Linus' tree

2016-11-22 Thread Stephen Rothwell
Hi Eric, On Tue, 22 Nov 2016 11:44:25 -0600 ebied...@xmission.com (Eric W. Biederman) wrote: > > > I just used the version of the userns tree from next-20161117 for today. > > Please merge v4.9-rc2 and fix up the conflicts (or just rebase onto > > v4.9-rc2). > > Will do. Thank you. Thanks.

Re: linux-next: manual merge of the userns tree with Linus' tree

2016-11-22 Thread Eric W. Biederman
Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the userns tree got conflicts in: > > arch/alpha/kernel/ptrace.c > arch/blackfin/kernel/ptrace.c > arch/cris/arch-v32/kernel/ptrace.c > arch/ia64/kernel/ptrace.c > arch/mips/kernel/ptrace32.c > arch/powerpc/kernel/ptr

Re: linux-next: manual merge of the userns tree with Linus' tree

2014-04-21 Thread Stephen Rothwell
On Thu, 17 Apr 2014 01:44:21 -0700 ebied...@xmission.com (Eric W. Biederman) wrote: > > Al Viro writes: > > > On Thu, Apr 17, 2014 at 03:06:57PM +1000, Stephen Rothwell wrote: > >> Hi Eric, > >> > >> Today's linux-next merge of the userns tree got a conflict in > >> fs/namespace.c between vario

Re: linux-next: manual merge of the userns tree with Linus' tree

2014-04-17 Thread Eric W. Biederman
Al Viro writes: > On Thu, Apr 17, 2014 at 03:06:57PM +1000, Stephen Rothwell wrote: >> Hi Eric, >> >> Today's linux-next merge of the userns tree got a conflict in >> fs/namespace.c between various commits from Linus' tree and various >> commits from the userns tree. >> >> I fixed it up (hopefu

Re: linux-next: manual merge of the userns tree with Linus' tree

2014-04-16 Thread Al Viro
On Thu, Apr 17, 2014 at 03:06:57PM +1000, Stephen Rothwell wrote: > Hi Eric, > > Today's linux-next merge of the userns tree got a conflict in > fs/namespace.c between various commits from Linus' tree and various > commits from the userns tree. > > I fixed it up (hopefully - see below) and can ca