Hi all,

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

  security/apparmor/apparmorfs.c

between commit:

  7bb1eb45e43c ("VFS: introduce start_removing_dentry()")

from the vfs-brauner tree and commit:

  eb028c33451a ("d_make_discardable(): warn if given a non-persistent dentry")

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 security/apparmor/apparmorfs.c
index 9d08d103f142,9b9090d38ea2..000000000000
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@@ -355,17 -355,22 +355,22 @@@ static void aafs_remove(struct dentry *
  	if (!dentry || IS_ERR(dentry))
  		return;
  
 +	/* ->d_parent is stable as rename is not supported */
  	dir = d_inode(dentry->d_parent);
 -	inode_lock(dir);
 -	if (simple_positive(dentry)) {
 +	dentry = start_removing_dentry(dentry->d_parent, dentry);
 +	if (!IS_ERR(dentry) && simple_positive(dentry)) {
- 		if (d_is_dir(dentry))
- 			simple_rmdir(dir, dentry);
- 		else
- 			simple_unlink(dir, dentry);
+ 		if (d_is_dir(dentry)) {
+ 			if (!WARN_ON(!simple_empty(dentry))) {
+ 				__simple_rmdir(dir, dentry);
+ 				dput(dentry);
+ 			}
+ 		} else {
+ 			__simple_unlink(dir, dentry);
+ 			dput(dentry);
+ 		}
  		d_delete(dentry);
 -		dput(dentry);
  	}
 -	inode_unlock(dir);
 +	end_removing(dentry);
  	simple_release_fs(&aafs_mnt, &aafs_count);
  }