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. -- Cheers, Stephen Rothwell s...@canb.auug.org.au
pgpHV1O64eFuZ.pgp
Description: PGP signature
