[folded-merged] userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix.patch removed from -mm tree

[folded-merged] userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix
has been removed from the -mm tree.  Its filename was
     userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix.patch

This patch was dropped because it was folded into userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix
Date: Wed Feb 26 01:50:26 PM PST 2025

reflow comment to 80 cols, s/end/end up/

Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/userfaultfd.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/mm/userfaultfd.c~userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount-fix
+++ a/mm/userfaultfd.c
@@ -1272,11 +1272,11 @@ retry:
 
 			locked = folio_trylock(folio);
 			/*
-			 * We avoid waiting for folio lock with a raised refcount
-			 * for large folios because extra refcounts will result in
-			 * split_folio() failing later and retrying. If multiple
-			 * tasks are trying to move a large folio we can end
-			 * livelocking.
+			 * We avoid waiting for folio lock with a raised
+			 * refcount for large folios because extra refcounts
+			 * will result in split_folio() failing later and
+			 * retrying.  If multiple tasks are trying to move a
+			 * large folio we can end up livelocking.
 			 */
 			if (!locked && folio_test_large(folio)) {
 				spin_unlock(src_ptl);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

userfaultfd-do-not-block-on-locking-a-large-folio-with-raised-refcount.patch
mm-vmscan-extract-calculated-pressure-balance-as-a-function-fix.patch
mm-madvise-split-out-mmap-locking-operations-for-madvise-fix-checkpatch-fixes.patch
mm-madvise-remove-redundant-mmap_lock-operations-from-process_madvise-fix.patch
selftests-mm-print-some-details-when-uffd-stress-gets-bad-params-fix.patch
selftests-mm-dont-fail-uffd-stress-if-too-many-cpus-fix.patch
mm-pgtable-convert-some-architectures-to-use-tlb_remove_ptdesc-v2-fix.patch
mm-mremap-initial-refactor-of-move_vma-fix.patch
mm-mremap-thread-state-through-move-page-table-operation-fix.patch
mm-hugetlb-add-hugetlb_alloc_threads-cmdline-option-fix.patch
lib-plistc-add-shortcut-for-plist_requeue-fix.patch
scsi-lpfc-convert-timeouts-to-secs_to_jiffies-fix.patch
signal-avoid-clearing-tif_sigpending-in-recalc_sigpending-if-unset-fix.patch