From: Mark Brown <broonie@kernel•org>
To: Chuck Lever <chuck.lever@oracle•com>
Cc: Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Namjae Jeon <linkinjeon@kernel•org>
Subject: linux-next: manual merge of the nfsd tree with the exfat tree
Date: Mon, 25 May 2026 12:25:35 +0100 [thread overview]
Message-ID: <ahQxr8IxGHct59V4@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1041 bytes --]
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in:
fs/exfat/file.c
between commit:
614f71ca1bdfa ("exfat: add iomap buffered I/O support")
from the exfat tree and commit:
27e0b573dd4aa ("exfat: Implement fileattr_get for case sensitivity")
from the nfsd 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/exfat/file.c
index e6e58584f567a,91e5511945d11..0000000000000
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@@ -14,7 -14,7 +14,8 @@@
#include <linux/writeback.h>
#include <linux/filelock.h>
#include <linux/falloc.h>
+#include <linux/iomap.h>
+ #include <linux/fileattr.h>
#include "exfat_raw.h"
#include "exfat_fs.h"
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-05-25 11:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ahQxr8IxGHct59V4@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=linkinjeon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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