The patch titled Subject: hugetlb-handle-truncate-racing-with-page-faults-fix-fix has been added to the -mm mm-unstable branch. Its filename is hugetlb-handle-truncate-racing-with-page-faults-fix-fix.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/hugetlb-handle-truncate-racing-with-page-faults-fix-fix.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: hugetlb-handle-truncate-racing-with-page-faults-fix-fix Date: Sat Aug 27 05:03:27 PM PDT 2022 fix merge snafu Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hugetlbfs/inode.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/hugetlbfs/inode.c~hugetlb-handle-truncate-racing-with-page-faults-fix-fix +++ a/fs/hugetlbfs/inode.c @@ -541,7 +541,6 @@ static void remove_inode_hugepages(struc struct folio_batch fbatch; struct folio *folio; pgoff_t next, index; - int i, freed = 0; unsigned int i; long freed = 0; u32 hash; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are asm-generic-sections-refactor-memory_intersects-fix.patch mm-page_alloc-fix-race-condition-between-build_all_zonelists-and-page-allocation-fix.patch procfs-add-path-to-proc-pid-fdinfo-fix.patch zsmalloc-zs_object_copy-add-clarifying-comment-fix.patch mm-gupc-simplify-and-fix-check_and_migrate_movable_pages-return-codes-fix-fix.patch mm-oom_kill-add-trace-logs-in-process_mrelease-system-call-fix.patch zsmalloc-zs_object_copy-replace-email-link-to-doc-checkpatch-fixes.patch mm-demotion-add-support-for-explicit-memory-tiers-fix.patch mm-demotion-update-node_is_toptier-to-work-with-memory-tiers-fix-2.patch mm-drop-oom-code-from-exit_mmap-fix-fix.patch mm-delete-unused-mmf_oom_victim-flag-vs-mglru.patch mm-add-merging-after-mremap-resize-checkpatch-fixes.patch mm-gupc-refactor-check_and_migrate_movable_pages-fix.patch hugetlb-rename-remove_huge_page-to-hugetlb_delete_from_page_cache-fix.patch hugetlb-handle-truncate-racing-with-page-faults-fix-fix.patch mm-reduce-noise-in-show_mem-for-lowmem-allocations-vs-mapletree.patch page_ext-introduce-boot-parameter-early_page_ext-fix.patch mm-fix-null-ptr-deref-in-kswapd_is_running-fix.patch ia64-fix-clock_getresclock_monotonic-to-report-itc-frequency-checkpatch-fixes.patch