From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Jeff Layton <jlayton@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Randy Dunlap <rdunlap@infradead•org>
Subject: linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
Date: Tue, 13 Jan 2026 12:21:41 +1100 [thread overview]
Message-ID: <20260113122141.1de833ab@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/fat/dir.c
between commit:
30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
from the mm-nonmm-unstable tree and commit:
a9acc8422ffb ("fat: add setlease file operation")
from the vfs-brauner 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/fat/dir.c
index af7dedf8adcb,07d95f1442c8..000000000000
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@@ -16,7 -16,7 +16,8 @@@
#include <linux/slab.h>
#include <linux/compat.h>
+#include <linux/hex.h>
+ #include <linux/filelock.h>
#include <linux/uaccess.h>
#include <linux/iversion.h>
#include "fat.h"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-13 1:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-13 1:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-12-18 5:16 linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree Stephen Rothwell
2025-11-20 0:44 Stephen Rothwell
2025-11-20 0:49 ` Andrew Morton
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=20260113122141.1de833ab@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)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