* linux-next: manual merge of the fs-next tree with the mm-unstable tree
@ 2025-09-15 17:46 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2025-09-15 17:46 UTC (permalink / raw)
Cc: Al Viro, Andrew Morton, Linux Kernel Mailing List,
Linux Next Mailing List, Lorenzo Stoakes
[-- Attachment #1: Type: text/plain, Size: 1739 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
Documentation/filesystems/porting.rst
between commit:
cf411621eeaa2 ("doc: update porting, vfs documentation for mmap_prepare actions")
from the mm-unstable tree and commit:
b28f9eba12a49 ("change the calling conventions for vfs_parse_fs_string()")
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 Documentation/filesystems/porting.rst
index 6743ed0b91126,85702e6fa1f21..0000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1286,7 -1286,14 +1286,19 @@@ The vm_area_desc provides the minimum r
to initialise state upon memory mapping of a file-backed region, and output
parameters for the file system to set this state.
+In nearly all cases, this is all that is required for a filesystem. However, if
+a filesystem needs to perform an operation such a pre-population of page tables,
+then that action can be specified in the vm_area_desc->action field, which can
+be configured using the mmap_action_*() helpers.
++
+ ---
+
+ **mandatory**
+
+ Calling conventions for vfs_parse_fs_string() have changed; it does *not*
+ take length anymore (value ? strlen(value) : 0 is used). If you want
+ a different length, use
+
+ vfs_parse_fs_qstr(fc, key, &QSTR_LEN(value, len))
+
+ instead.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the fs-next tree with the mm-unstable tree
@ 2026-01-26 16:41 Mark
0 siblings, 0 replies; 3+ messages in thread
From: Mark @ 2026-01-26 16:41 UTC (permalink / raw)
To: Konstantin Komarov
Cc: Andrew Morton, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List, Lorenzo Stoakes
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. */
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the fs-next tree with the mm-unstable tree
@ 2026-05-25 13:55 Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2026-05-25 13:55 UTC (permalink / raw)
Cc: Andrew Morton, David Sterba, Linux Kernel Mailing List,
Linux Next Mailing List, Qu Wenruo, Zi Yan
[-- Attachment #1: Type: text/plain, Size: 1878 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
fs/btrfs/defrag.c
between commit:
5573c81882722 ("fs/btrfs: remove a comment referring to READ_ONLY_THP_FOR_FS")
from the mm-unstable tree and commit:
871bf8cef0139 ("btrfs: move large data folios out of experimental features")
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 --combined fs/btrfs/defrag.c
index a8d49d9ca981c,f0c6758b7055d..0000000000000
--- a/fs/btrfs/defrag.c
+++ b/fs/btrfs/defrag.c
@@@ -859,20 -859,6 +859,6 @@@ again
if (IS_ERR(folio))
return folio;
- /*
- * The IO for such large folios is not fully tested, thus return
- * an error to reject such folios unless it's an experimental build.
- *
- * Filesystem transparent huge pages are typically only used for
- * executables that explicitly enable them, so this isn't very
- * restrictive.
- */
- if (!IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL) && folio_test_large(folio)) {
- folio_unlock(folio);
- folio_put(folio);
- return ERR_PTR(-ETXTBSY);
- }
-
ret = set_folio_extent_mapped(folio);
if (ret < 0) {
folio_unlock(folio);
@@@ -1176,7 -1162,6 +1162,6 @@@ static int defrag_one_locked_target(str
if (start >= folio_next_pos(folio) ||
start + len <= folio_pos(folio))
continue;
- btrfs_folio_clamp_clear_checked(fs_info, folio, start, len);
btrfs_folio_clamp_set_dirty(fs_info, folio, start, len);
}
btrfs_delalloc_release_extents(inode, len);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-05-25 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-15 17:46 linux-next: manual merge of the fs-next tree with the mm-unstable tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:41 Mark
2026-05-25 13:55 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox