Hi all,

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

  fs/ntfs3/dir.c

between commit:

  dffc7f2f177b ("fs/ntfs3: allow readdir() to finish after directory mutations without rewinddir()")

from the ntfs3 tree and commit:

  0c071146080a ("ntfs: ->d_compare() must not block")

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/ntfs3/dir.c
index 385cd806d32e,cf038d713f50..000000000000
--- a/fs/ntfs3/dir.c
+++ b/fs/ntfs3/dir.c
@@@ -544,13 -498,13 +543,13 @@@ static int ntfs_readdir(struct file *fi
  	}
  
  out:
- 	__putname(name);
 -
+ 	kfree(name);
  	put_indx_node(node);
  
 -	if (err == 1) {
 +	if (!err) {
 +		/* End of directory. */
 +		ctx->pos = eod;
 +	} else if (err == 1) {
  		/* 'ctx' is full. */
  		err = 0;
  	} else if (err == -ENOENT) {