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

[David Howells]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   fs/afs/dir.c
> 
> between commit:
> 
>   6dd80936618c ("afs: Use netfslib for directories")
> 
> from the vfs-brauner tree and commit:
> 
>   8281b27ee7ec ("afs_d_revalidate(): use stable name and parent inode passed by caller")
> 
> 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.

That looks correct.

Acked-by: David Howells <dhowells@xxxxxxxxxx>