Merge branch 'next' into for-linus

diff --cc fs/namespace.c
index f20cb57d1067adc0b409a56a5881da45edf6692e,c36785a2fd86973a9569d39910a81056b89306c9..88058de59c7c2ca9edf14453f1fbeeaa4017bfa8
--- 1/fs/namespace.c
--- 2/fs/namespace.c
+++ b/fs/namespace.c
@@@ -1432,14 -1429,9 +1429,9 @@@ static int graft_tree(struct vfsmount *
  
        err = -ENOENT;
        mutex_lock(&path->dentry->d_inode->i_mutex);
 -      if (IS_DEADDIR(path->dentry->d_inode))
 +      if (cant_mount(path->dentry))
                goto out_unlock;
  
-       err = security_sb_check_sb(mnt, path);
-       if (err)
-               goto out_unlock;
- 
-       err = -ENOENT;
        if (!d_unlinked(path->dentry))
                err = attach_recursive_mnt(mnt, path, NULL);
  out_unlock:

diff --cc kernel/acct.c
Simple merge