Merge 'ntfs' from https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git (ntfs-next) Merged-SHA: ea3566a3fa235cd0325b2bedf91ceec65073004b CREDITS | 9 +- Documentation/filesystems/index.rst | 1 + Documentation/filesystems/ntfs.rst | 159 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ntfs/Kconfig | 48 + fs/ntfs/Makefile | 10 + fs/ntfs/aops.c | 263 ++ fs/ntfs/attrib.c | 5428 +++++++++++++++++++++++++++++++++++ fs/ntfs/attrib.h | 164 ++ fs/ntfs/attrlist.c | 289 ++ fs/ntfs/attrlist.h | 20 + fs/ntfs/bdev-io.c | 117 + fs/ntfs/bitmap.c | 287 ++ fs/ntfs/bitmap.h | 100 + fs/ntfs/collate.c | 146 + fs/ntfs/collate.h | 36 + fs/ntfs/compress.c | 1577 ++++++++++ fs/ntfs/debug.c | 171 ++ fs/ntfs/debug.h | 63 + fs/ntfs/dir.c | 1236 ++++++++ fs/ntfs/dir.h | 32 + fs/ntfs/ea.c | 943 ++++++ fs/ntfs/ea.h | 30 + fs/ntfs/file.c | 1161 ++++++++ fs/ntfs/index.c | 2117 ++++++++++++++ fs/ntfs/index.h | 111 + fs/ntfs/inode.c | 3817 ++++++++++++++++++++++++ fs/ntfs/inode.h | 358 +++ fs/ntfs/iomap.c | 870 ++++++ fs/ntfs/iomap.h | 23 + fs/ntfs/layout.h | 2346 +++++++++++++++ fs/ntfs/lcnalloc.c | 1047 +++++++ fs/ntfs/lcnalloc.h | 134 + fs/ntfs/logfile.c | 778 +++++ fs/ntfs/logfile.h | 245 ++ fs/ntfs/malloc.h | 77 + fs/ntfs/mft.c | 2924 +++++++++++++++++++ fs/ntfs/mft.h | 91 + fs/ntfs/mst.c | 194 ++ fs/ntfs/namei.c | 1692 +++++++++++ fs/ntfs/ntfs.h | 294 ++ fs/ntfs/object_id.c | 158 + fs/ntfs/object_id.h | 14 + fs/ntfs/quota.c | 95 + fs/ntfs/quota.h | 15 + fs/ntfs/reparse.c | 573 ++++ fs/ntfs/reparse.h | 20 + fs/ntfs/runlist.c | 2066 +++++++++++++ fs/ntfs/runlist.h | 97 + fs/ntfs/super.c | 2771 ++++++++++++++++++ fs/ntfs/sysctl.c | 54 + fs/ntfs/sysctl.h | 26 + fs/ntfs/time.h | 87 + fs/ntfs/unistr.c | 477 +++ fs/ntfs/upcase.c | 70 + fs/ntfs/volume.h | 296 ++ fs/ntfs3/Kconfig | 10 +- fs/ntfs3/dir.c | 10 - fs/ntfs3/file.c | 11 - fs/ntfs3/inode.c | 16 +- fs/ntfs3/ntfs_fs.h | 11 - fs/ntfs3/super.c | 59 +- include/uapi/linux/fs.h | 12 + 65 files changed, 36249 insertions(+), 118 deletions(-) Into: fs-next No textual conflicts detected. Running build test to check for merge-related build issues... Running build test: stable build log Build test failed! Invoking LLM to resolve build issues... Invoking: /home/sasha/claude.sh (prompt: 6469 bytes, ~1617 tokens) ================================================================================ Build passes. Here's the summary: **Problem:** The VFS commit `96fefcabf340f` ("vfs: widen inode hash/lookup functions to u64") changed `find_inode_nowait`'s callback type from `int (*)(struct inode *, unsigned long, void *)` to `int (*)(struct inode *, u64, void *)`. The NTFS commit `d9038d99fb5c6` ("ntfs: change mft_no type to u64") updated many NTFS types but didn't touch the `ntfs_test_inode_wb` callback signature since it matched the old VFS API at the time. **Fix:** Changed the `ino` parameter type in `ntfs_test_inode_wb` from `unsigned long` to `u64` at `fs/ntfs/mft.c:635`. The parameter isn't used in the function body (only `vi` and `data` are used), so this is a straightforward type alignment with zero semantic risk. **Confidence:** High. This is a trivial type mismatch fix with no behavioral change. ================================================================================ Command completed successfully.