Merge remote-tracking branch 'vfs/for-next'

diff --cc drivers/block/cciss.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc fs/cifs/file.c
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/f2fs/dir.c
Simple merge

diff --cc fs/f2fs/file.c
Simple merge

diff --cc fs/jbd2/journal.c
Simple merge

diff --cc fs/namespace.c
index d581e45c0a9fd6ada94edd2bb6ea4fe4c7fc9e23,bae08eaade35547366db6a9ef465a7bd333df9a8..af7355409b908f8efed3418c7ff0c11d47d6e10b
--- 1/fs/namespace.c
--- 2/fs/namespace.c
+++ b/fs/namespace.c
@@@ -2346,10 -2384,10 +2391,10 @@@ static struct mnt_namespace *dup_mnt_ns
        /* First pass: copy the tree topology */
        copy_flags = CL_COPY_ALL | CL_EXPIRE;
        if (user_ns != mnt_ns->user_ns)
 -              copy_flags |= CL_SHARED_TO_SLAVE;
 +              copy_flags |= CL_SHARED_TO_SLAVE | CL_UNPRIVILEGED;
        new = copy_tree(old, old->mnt.mnt_root, copy_flags);
        if (IS_ERR(new)) {
-               up_write(&namespace_sem);
+               namespace_unlock();
                free_mnt_ns(new_ns);
                return ERR_CAST(new);
        }

diff --cc fs/pnode.c
index 8b29d2164da6aef6edb88b9872368c849e658530,43617258fa6aab3bb9623b9509167f538bdc7386..3d2a7141b87a4b38a1aea383a68810ada1271404
--- 1/fs/pnode.c
--- 2/fs/pnode.c
+++ b/fs/pnode.c
@@@ -218,10 -217,9 +218,10 @@@ static struct mount *get_source(struct 
   * @source_mnt: source mount.
   * @tree_list : list of heads of trees to be attached.
   */
- int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
+ int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp,
                    struct mount *source_mnt, struct list_head *tree_list)
  {
 +      struct user_namespace *user_ns = current->nsproxy->mnt_ns->user_ns;
        struct mount *m, *child;
        int ret = 0;
        struct mount *prev_dest_mnt = dest_mnt;

diff --cc fs/pnode.h
Simple merge

diff --cc fs/proc/root.c
Simple merge

diff --cc fs/read_write.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge