[folded-merged] mm-cma-add-cma_allocfree_folio-fix.patch removed from -mm tree

[folded-merged] mm-cma-add-cma_allocfree_folio-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-cma-add-cma_allocfree_folio-fix
has been removed from the -mm tree.  Its filename was
     mm-cma-add-cma_allocfree_folio-fix.patch

This patch was dropped because it was folded into mm-cma-add-cma_allocfree_folio.patch

------------------------------------------------------
From: Yu Zhao <yuzhao@google.com>
Subject: mm-cma-add-cma_allocfree_folio-fix
Date: Thu, 22 Aug 2024 11:24:14 -0600

fix WARN in cma_alloc_folio()

Link: https://lkml.kernel.org/r/Zsd0PgAQmbpR8jS6@google.com
Signed-off-by: Yu Zhao <yuzhao@google.com>
Cc: Frank van der Linden <fvdl@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/cma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/cma.c~mm-cma-add-cma_allocfree_folio-fix
+++ a/mm/cma.c
@@ -522,7 +522,7 @@ struct folio *cma_alloc_folio(struct cma
 {
 	struct page *page;
 
-	if (WARN_ON(!order || !(gfp | __GFP_COMP)))
+	if (WARN_ON(!order || !(gfp & __GFP_COMP)))
 		return NULL;
 
 	page = __cma_alloc(cma, 1 << order, order, gfp);
_

Patches currently in -mm which might be from yuzhao@google.com are

mm-contig_alloc-support-__gfp_comp.patch
mm-cma-add-cma_allocfree_folio.patch
mm-hugetlb-use-__gfp_comp-for-gigantic-folios.patch
mm-free-zapped-tail-pages-when-splitting-isolated-thp.patch
mm-remap-unused-subpages-to-shared-zeropage-when-splitting-isolated-thp.patch