Messages in this thread | | | Date | Fri, 8 Nov 2013 13:59:15 +0100 | From | Oleg Nesterov <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the vfs tree |
| |
On 11/08, Stephen Rothwell wrote: > > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation > to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs: > forbid open via /proc") from the akpm-current tree. > > I just dropped the akpm-current changes for today - they should probably > be applied to fs/libfs.c.
Well, this probably means that
anon_inodefs-forbid-open-via-proc.patch
should be dropped. I'll rediff this patch against vfs.git
Oleg.
| |