Messages in this thread | | | Date | Mon, 9 Sep 2013 15:16:19 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with Linus' tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/internal.h between commit eed810076685 ("vfs: check unlinked ancestors before mount") from Linus' tree and commit "shrinker: convert superblock shrinkers to new API" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/internal.h index 62f05e9,c909014..0000000 --- a/fs/internal.h +++ b/fs/internal.h @@@ -126,7 -127,7 +127,8 @@@ extern int invalidate_inodes(struct sup * dcache.c */ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *); +extern int d_set_mounted(struct dentry *dentry); + extern long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan); /* * read_write.c [unhandled content-type:application/pgp-signature] | |