Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/debugfs/inode.c

between commit:

  8b45b9a88233 ("debugfs: rename end_creating() to debugfs_end_creating()")

from the vfs-brauner tree and commits:

  ebb54484c3df ("convert debugfs")
  0703b36e4e1c ("debugfs: remove duplicate checks in callers of start_creating()")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/debugfs/inode.c
index 532bd7c46baf,25a554331ac4..000000000000
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@@ -403,18 -403,17 +403,17 @@@ static struct dentry *debugfs_start_cre
  	return dentry;
  }
  
 -static struct dentry *failed_creating(struct dentry *dentry)
 +static struct dentry *debugfs_failed_creating(struct dentry *dentry)
  {
- 	inode_unlock(d_inode(dentry->d_parent));
- 	dput(dentry);
+ 	simple_done_creating(dentry);
  	simple_release_fs(&debugfs_mount, &debugfs_mount_count);
  	return ERR_PTR(-ENOMEM);
  }
  
 -static struct dentry *end_creating(struct dentry *dentry)
 +static struct dentry *debugfs_end_creating(struct dentry *dentry)
  {
- 	inode_unlock(d_inode(dentry->d_parent));
- 	return dentry;
+ 	simple_done_creating(dentry);
+ 	return dentry; // borrowed
  }
  
  static struct dentry *__debugfs_create_file(const char *name, umode_t mode,
@@@ -456,9 -450,9 +450,9 @@@
  	DEBUGFS_I(inode)->raw = real_fops;
  	DEBUGFS_I(inode)->aux = (void *)aux;
  
- 	d_instantiate(dentry, inode);
+ 	d_make_persistent(dentry, inode);
  	fsnotify_create(d_inode(dentry->d_parent), dentry);
 -	return end_creating(dentry);
 +	return debugfs_end_creating(dentry);
  }
  
  struct dentry *debugfs_create_file_full(const char *name, umode_t mode,
@@@ -602,10 -591,10 +591,10 @@@ struct dentry *debugfs_create_dir(cons
  
  	/* directory inodes start off with i_nlink == 2 (for "." entry) */
  	inc_nlink(inode);
- 	d_instantiate(dentry, inode);
+ 	d_make_persistent(dentry, inode);
  	inc_nlink(d_inode(dentry->d_parent));
  	fsnotify_mkdir(d_inode(dentry->d_parent), dentry);
 -	return end_creating(dentry);
 +	return debugfs_end_creating(dentry);
  }
  EXPORT_SYMBOL_GPL(debugfs_create_dir);
  
@@@ -649,10 -633,10 +633,10 @@@ struct dentry *debugfs_create_automount
  	DEBUGFS_I(inode)->automount = f;
  	/* directory inodes start off with i_nlink == 2 (for "." entry) */
  	inc_nlink(inode);
- 	d_instantiate(dentry, inode);
+ 	d_make_persistent(dentry, inode);
  	inc_nlink(d_inode(dentry->d_parent));
  	fsnotify_mkdir(d_inode(dentry->d_parent), dentry);
 -	return end_creating(dentry);
 +	return debugfs_end_creating(dentry);
  }
  EXPORT_SYMBOL(debugfs_create_automount);
  
@@@ -704,8 -688,8 +688,8 @@@ struct dentry *debugfs_create_symlink(c
  	inode->i_mode = S_IFLNK | S_IRWXUGO;
  	inode->i_op = &debugfs_symlink_inode_operations;
  	inode->i_link = link;
- 	d_instantiate(dentry, inode);
+ 	d_make_persistent(dentry, inode);
 -	return end_creating(dentry);
 +	return debugfs_end_creating(dentry);
  }
  EXPORT_SYMBOL_GPL(debugfs_create_symlink);