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

[Al Viro]

On Mon, Jun 23, 2025 at 09:12:50AM +1000, Stephen Rothwell wrote:
> 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.

Sorry - should've folded that into #for-next.