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

2017-11-30 Thread Stephen Rothwell
Hi Al, On Wed, 29 Nov 2017 10:53:29 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the vfs tree got conflicts in several files > due to commit: > > 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)") > > from Linus' tree and commit: > > c2c6773f9942 ("VFS: Roll out

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

2017-02-27 Thread David Howells
Stephen Rothwell wrote: > Today's linux-next merge of the vfs tree got a conflict in: > > fs/proc/base.c > > between commit: > > 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in > user namespaces") > > from Linus' tree and commit: > > caffc373c573 ("statx: Add

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

2016-05-18 Thread Steve French
As noted below, it is easier to remove the obsolete comments and I just pushed the following trivial patch to cifs-2.6.git for-next to do that. https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=fea17ae8ac1c8c44b2fd1c02ae2e15b847d327d1 On Wed, May 18, 2016 at 8:17 PM, Stephen Rothwell wr