Hi all,

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

  fs/afs/internal.h

between commit:

  09c69289a2730 ("afs: Add support for RENAME_NOREPLACE and RENAME_EXCHANGE")

from the fs-next tree and commit:

  09c2e9069e0fb ("afs_edit_dir_{add,remove}(): constify qstr argument")

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.

diff --cc fs/afs/internal.h
index 444a3ea4fdf65,1ce5deaf60193..0000000000000
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@@ -1099,11 -1097,11 +1099,11 @@@ int afs_single_writepages(struct addres
  /*
   * dir_edit.c
   */
- extern void afs_edit_dir_add(struct afs_vnode *, struct qstr *, struct afs_fid *,
+ extern void afs_edit_dir_add(struct afs_vnode *, const struct qstr *, struct afs_fid *,
  			     enum afs_edit_dir_reason);
- extern void afs_edit_dir_remove(struct afs_vnode *, struct qstr *, enum afs_edit_dir_reason);
+ extern void afs_edit_dir_remove(struct afs_vnode *, const struct qstr *, enum afs_edit_dir_reason);
 -void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_dvnode,
 -				enum afs_edit_dir_reason why);
 +void afs_edit_dir_update(struct afs_vnode *vnode, const struct qstr *name,
 +			 struct afs_vnode *new_dvnode, enum afs_edit_dir_reason why);
  void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_vnode);
  
  /*