Hi Eric, After merging the userns tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/namei.c: In function 'covered': fs/namei.c:3528:2: error: too many arguments to function '__lookup_mnt' is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1); ^ Caused by my incomplete merge resolution between commits 474279dc0f77 ("split __lookup_mnt() in two functions") from the vfs tree and a3b4491433f2 ("vfs: Don't allow overwriting mounts in the current mount namespace") from the userns tree. I added the following fix up patch: From: Stephen Rothwell Date: Fri, 8 Nov 2013 17:56:35 +1100 Subject: [PATCH] vfs: merge fixup for __lookup_mnt() API change Signed-off-by: Stephen Rothwell --- fs/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/namei.c b/fs/namei.c index 83463500c582..03d999bf9a89 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3525,7 +3525,7 @@ static bool covered(struct vfsmount *mnt, struct dentry *dentry) bool is_covered; rcu_read_lock(); - is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1); + is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry); rcu_read_unlock(); return is_covered; -- 1.8.4.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au