linux-next: manual merge of the fuse tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  fs/fuse/inode.c

between commit:

  053fc4f755ad ("fuse: fix UAF in rcu pathwalks")

from Linus' tree and commit:

  9fc953f59383 ("fuse: implement ioctls to manage backing files")

from the fuse 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/fuse/inode.c
index 516ea2979a90,c26a84439934..000000000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -1373,7 -1395,9 +1402,9 @@@ EXPORT_SYMBOL_GPL(fuse_send_init)
  void fuse_free_conn(struct fuse_conn *fc)
  {
  	WARN_ON(!list_empty(&fc->devices));
+ 	if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH))
+ 		fuse_backing_files_free(fc);
 -	kfree_rcu(fc, rcu);
 +	kfree(fc);
  }
  EXPORT_SYMBOL_GPL(fuse_free_conn);

Attachment: pgpRCM0Z5XBAJ.pgp
Description: OpenPGP digital signature