[folded-merged] mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order-fix.patch removed from -mm tree

[folded-merged] mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: Re: mm: page_alloc: make defrag_mode retries follow the promoted order
has been removed from the -mm tree.  Its filename was
     mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order-fix.patch

This patch was dropped because it was folded into mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order.patch

------------------------------------------------------
From: Kiryl Shutsemau <kas@kernel.org>
Subject: Re: mm: page_alloc: make defrag_mode retries follow the promoted order
Date: Thu, 15 Oct 2026 13:50:55 +0100

s/order_nofrag_promoted/order_defrag_promoted/, per hannes

Link: https://lore.kernel.org/atDL-nSFP2KVU7cI@thinkstation
Signed-off-by: Kiryl Shutsemau <kas@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Harry Yoo <harry@kernel.org>
Cc: Usama Arif <usama.arif@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Brendan Jackman <brendan.jackman@linux.dev>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: <stable@vger.kernel.org>
---

 mm/page_alloc.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/mm/page_alloc.c~mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order-fix
+++ a/mm/page_alloc.c
@@ -4117,7 +4117,7 @@ out:
 	return page;
 }
 
-static inline bool order_nofrag_promoted(unsigned int order,
+static inline bool order_defrag_promoted(unsigned int order,
 					 const struct alloc_context *ac)
 {
 	return ac->reclaim_compact_order != order;
@@ -4250,7 +4250,7 @@ should_compact_retry(gfp_t gfp_mask, str
 	 * Promoted requests fall back instead.
 	 */
 	if (compact_result == COMPACT_SKIPPED) {
-		if (!order_nofrag_promoted(order, ac))
+		if (!order_defrag_promoted(order, ac))
 			ret = compaction_zonelist_suitable(ac, order,
 							   alloc_flags, gfp_mask);
 		goto out;
@@ -4632,7 +4632,7 @@ should_reclaim_retry(gfp_t gfp_mask, uns
 	 * for compaction without freeing anything.
 	 */
 	if (did_some_progress && order <= PAGE_ALLOC_COSTLY_ORDER &&
-	    !order_nofrag_promoted(order, ac))
+	    !order_defrag_promoted(order, ac))
 		*no_progress_loops = 0;
 	else
 		(*no_progress_loops)++;
@@ -5014,7 +5014,7 @@ retry:
 	if (defrag_mode && (alloc_flags & ALLOC_NOFRAGMENT)) {
 		alloc_flags &= ~ALLOC_NOFRAGMENT;
 		/* Retries went into making blocks, start the fallback afresh */
-		if (order_nofrag_promoted(order, ac)) {
+		if (order_defrag_promoted(order, ac)) {
 			no_progress_loops = 0;
 			compaction_retries = 0;
 		}
_

Patches currently in -mm which might be from kas@kernel.org are

mm-page_alloc-make-defrag_mode-retries-follow-the-promoted-order.patch
mm-khugepaged-drop-redundant-mm_struct-pin-in-madvise_collapse.patch
mm-khugepaged-count-collapses-where-khugepaged-makes-them.patch
mm-khugepaged-rename-mthp_present_ptes-bitmap-to-eligible_ptes.patch
mm-collapse-add-collapseh-for-the-collapse-interface.patch
mm-collapse-state-what-a-collapse-may-do-in-the-policy.patch
mm-collapse-drop-the-collapse_possible-wrapper.patch
mm-collapse-name-the-per-table-scan-reset-for-what-it-resets.patch
mm-collapse-call-collapse_file-from-collapse_single_pmd.patch
mm-collapse-separate-scanning-a-pte-table-from-collapsing-it.patch