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

Stephen Rothwell writes: > Hi all, > > On Wed, 20 Jun 2018 12:39:05 +1000 Stephen Rothwell > wrote: > > Are there any comments on this resolution. I just had to do it all > again due to slight changes in the vfs tree. What are you guys going > to tell Linus when he comes to merge this? Curre

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

Hi all, On Wed, 20 Jun 2018 12:39:05 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > fs/proc/inode.c > fs/proc/root.c > > between commit: > > 0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c") > 83cd45075c36 ("proc: A

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

Hi all, On Wed, 20 Jun 2018 11:44:41 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > fs/proc/internal.h > > between commit: > > 0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c") > > from the vfs tree and commit: > >

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

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the userns tree got conflicts in: > > fs/proc/inode.c > fs/proc/root.c > > between commits: > > 0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c") > 83cd45075c36 ("proc: Add fs_context support to procfs") >

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

Stephen Rothwell writes: > Hi Eric, > > Today's linux-next merge of the userns tree got a conflict in > kernel/user_namespace.c between commits 3c0411846118 ("switch the rest > of proc_ns_operations to working with &...->ns") and 64964528b24e > ("make proc_ns_operations work with struct ns_common