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

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

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

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 >

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

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 >

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

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/ptrace32.c include/linux/mm.h

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

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/ptrace32.c include/linux/mm.h

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: fs/posix_acl.c between commit: 485e71e8fb63 ("posix_acl: Add set_posix_acl") from Linus' tree and commit: 0d4d717f2583 ("vfs: Verify acls are valid within superblock's s_user_ns.") from the userns tree. I fixed

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: fs/posix_acl.c between commit: 485e71e8fb63 ("posix_acl: Add set_posix_acl") from Linus' tree and commit: 0d4d717f2583 ("vfs: Verify acls are valid within superblock's s_user_ns.") from the userns tree. I fixed

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: fs/proc/root.c between commit: e54ad7f1ee26 ("proc: prevent stacking filesystems on top") from Linus' tree and commit: e94591d0d90c ("proc: Convert proc_mount to use mount_ns") from the userns tree. I fixed it up

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: fs/proc/root.c between commit: e54ad7f1ee26 ("proc: prevent stacking filesystems on top") from Linus' tree and commit: e94591d0d90c ("proc: Convert proc_mount to use mount_ns") from the userns tree. I fixed it up

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

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

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

On Thu, 17 Apr 2014 01:44:21 -0700 ebied...@xmission.com (Eric W. Biederman) wrote: Al Viro v...@zeniv.linux.org.uk 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

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

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

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

Al Viro v...@zeniv.linux.org.uk 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

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

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

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

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 carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

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 carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

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 carry

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/namespace.c between commits from Linus' tree and commits from the userns tree. I fixed it up (I used the conflict resolution that your sent to Linus - see below) and can carry the fix as necessary (no action is required).

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/namei.c between commits from Linus' tree and commits 3dd905eaa258 ("vfs: Don't allow overwriting mounts in the current mount namespace") and f43d102a391d ("vfs: Lazily remove mounts on unlinked files and directories") from

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/dcache.c between commit da1ce0670c14 ("vfs: add cross-rename") from Linus' tree and commit f43d102a391d ("vfs: Lazily remove mounts on unlinked files and directories") from the userns tree. I fixed it up (see below) and

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/namei.c between commits from Linus' tree and commits 3dd905eaa258 (vfs: Don't allow overwriting mounts in the current mount namespace) and f43d102a391d (vfs: Lazily remove mounts on unlinked files and directories) from the

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/dcache.c between commit da1ce0670c14 (vfs: add cross-rename) from Linus' tree and commit f43d102a391d (vfs: Lazily remove mounts on unlinked files and directories) from the userns tree. I fixed it up (see below) and can

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in fs/namespace.c between commits from Linus' tree and commits from the userns tree. I fixed it up (I used the conflict resolution that your sent to Linus - see below) and can carry the fix as necessary (no action is required).