From: Mark Brown <broonie@kernel•org>
To: Al Viro <viro@zeniv•linux.org.uk>
Cc: Christian Brauner <brauner@kernel•org>,
David Howells <dhowells@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs tree with the fs-next tree
Date: Mon, 15 Sep 2025 17:28:19 +0100 [thread overview]
Message-ID: <aMg-o7KPAkDmqQN8@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1727 bytes --]
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);
/*
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-15 16:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 16:28 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-15 16:38 linux-next: manual merge of the vfs tree with the fs-next tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aMg-o7KPAkDmqQN8@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox