From: Mark <broonie@kernel•org>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lorenzo Stoakes <lorenzo.stoakes@oracle•com>
Subject: linux-next: manual merge of the fs-next tree with the mm-unstable tree
Date: Mon, 26 Jan 2026 16:41:25 +0000 [thread overview]
Message-ID: <aXeZNSiVv82Gc9HF@sirena.org.uk> (raw)
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
fs/ntfs3/file.c
between commit:
77a150da4e780 ("mm: update all remaining mmap_prepare users to use vma_flags_t")
from the mm-unstable tree and commit:
9d5403b1036cd ("fs: convert most other generic_file_*mmap() users to .mmap_prepare()")
099ef9ab9203d (fs/ntfs3: implement iomap-based file operations)
from the fs-next 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/ntfs3/file.c
index 2902fc6d9a85d,571ee85e82594..0000000000000
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@@ -346,8 -246,7 +246,7 @@@ static int ntfs_file_mmap_prepare(struc
struct file *file = desc->file;
struct inode *inode = file_inode(file);
struct ntfs_inode *ni = ntfs_i(inode);
- u64 from = ((u64)desc->pgoff << PAGE_SHIFT);
- bool rw = desc->vm_flags & VM_WRITE;
+ const bool rw = vma_desc_test_flags(desc, VMA_WRITE_BIT);
int err;
/* Avoid any operation if inode is bad. */
next reply other threads:[~2026-01-26 16:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 16:41 Mark [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-25 13:55 linux-next: manual merge of the fs-next tree with the mm-unstable tree Mark Brown
2025-09-15 17:46 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=aXeZNSiVv82Gc9HF@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=almaz.alexandrovich@paragon-software$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lorenzo.stoakes@oracle$(echo .)com \
/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