From: broonie@kernel•org
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Namjae Jeon <linkinjeon@kernel•org>,
Steve French <stfrench@microsoft•com>
Subject: linux-next: manual merge of the vfs tree with the ksmbd tree
Date: Fri, 21 Apr 2023 13:38:20 +0100 [thread overview]
Message-ID: <20230421123820.79447-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the vfs tree got conflicts in:
include/linux/namei.h
fs/ksmbd/vfs.c
between commits:
624d981552e10 ("ksmbd: fix racy issue from using ->d_parent and ->d_name")
0242bdc54a512 ("fs: introduce lock_rename_child() helper")
35175d058b140 ("ksmbd: remove internal.h include")
from the ksmbd tree and commits:
9bc37e04823b5 ("fs: introduce lock_rename_child() helper")
211db0ac9e3dc ("ksmbd: remove internal.h include")
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/ksmbd/vfs.c
index 778c152708e43,cef07d7fb7dc4..0000000000000
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
diff --cc include/linux/namei.h
index 1463cbda48886,5864e4d82e567..0000000000000
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
[The ksmbd version was already in the tree with one extra commit on top
of the two that appear to have been cherry picked from the vfs tree.]
next reply other threads:[~2023-04-21 12:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 12:38 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-05 23:59 linux-next: manual merge of the vfs tree with the ksmbd tree Stephen Rothwell
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=20230421123820.79447-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=linkinjeon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stfrench@microsoft$(echo .)com \
--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