[merged mm-stable] mm-shmem-remove-unnecessary-restrain-unmask-of-swap-gfp-flags.patch removed from -mm tree

[merged mm-stable] mm-shmem-remove-unnecessary-restrain-unmask-of-swap-gfp-flags.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm/shmem: remove unnecessary restrain unmask of swap gfp flags
has been removed from the -mm tree.  Its filename was
     mm-shmem-remove-unnecessary-restrain-unmask-of-swap-gfp-flags.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kairui Song <kasong@tencent.com>
Subject: mm/shmem: remove unnecessary restrain unmask of swap gfp flags
Date: Wed, 11 Feb 2026 22:33:23 +0800

The comment makes it look like copy-paste leftovers from
shmem_replace_folio.  The first try of the swap doesn't always have a
limited zone.

So don't drop the restraint, which should make the GFP more accurate.

Link: https://lkml.kernel.org/r/20260211-shmem-swap-gfp-v1-1-e9781099a861@tencent.com
Signed-off-by: Kairui Song <kasong@tencent.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/shmem.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

--- a/mm/shmem.c~mm-shmem-remove-unnecessary-restrain-unmask-of-swap-gfp-flags
+++ a/mm/shmem.c
@@ -2044,14 +2044,8 @@ static struct folio *shmem_swap_alloc_fo
 	struct shmem_inode_info *info = SHMEM_I(inode);
 	struct folio *new, *swapcache;
 	int nr_pages = 1 << order;
-	gfp_t alloc_gfp;
+	gfp_t alloc_gfp = gfp;
 
-	/*
-	 * We have arrived here because our zones are constrained, so don't
-	 * limit chance of success with further cpuset and node constraints.
-	 */
-	gfp &= ~GFP_CONSTRAINT_MASK;
-	alloc_gfp = gfp;
 	if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 		if (WARN_ON_ONCE(order))
 			return ERR_PTR(-EINVAL);
_

Patches currently in -mm which might be from kasong@tencent.com are