linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]

Hi all,

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

  Documentation/filesystems/porting.rst

between commit:

  2e7072350656 ("replace collect_mounts()/drop_collected_mounts() with safer variant")

from the vfs-fixes tree and commits:

  05fb0e666495 ("new helper: set_default_d_op()")
  691fb82ca6cc ("make d_set_d_op() static")

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 Documentation/filesystems/porting.rst
index 200226bfd6cf,579f17df46cf..000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1249,9 -1252,18 +1249,27 @@@ an extra reference to new mount - it sh
  
  ---
  
 +collect_mounts()/drop_collected_mounts()/iterate_mounts() are gone now.
 +Replacement is collect_paths()/drop_collected_path(), with no special
 +iterator needed.  Instead of a cloned mount tree, the new interface returns
 +an array of struct path, one for each mount collect_mounts() would've
 +created.  These struct path point to locations in the caller's namespace
 +that would be roots of the cloned mounts.
++
++---
++
+ **mandatory**
+ 
+ If your filesystem sets the default dentry_operations, use set_default_d_op()
+ rather than manually setting sb->s_d_op.
+ 
+ ---
+ 
+ **mandatory**
+ 
+ d_set_d_op() is no longer exported (or public, for that matter); _if_
+ your filesystem really needed that, make use of d_splice_alias_ops()
+ to have them set.  Better yet, think hard whether you need different
+ ->d_op for different dentries - if not, just use set_default_d_op()
+ at mount time and be done with that.  Currently procfs is the only
+ thing that really needs ->d_op varying between dentries.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]