[folded-merged] cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix.patch removed from -mm tree

[folded-merged] cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix
has been removed from the -mm tree.  Its filename was
     cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix.patch

This patch was dropped because it was folded into cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix

fix comment layout and spelling

Cc: Hui Zhu <zhuhui@xiaomi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN mm/page_alloc.c~cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix mm/page_alloc.c
--- a/mm/page_alloc.c~cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok-fix
+++ a/mm/page_alloc.c
@@ -1839,10 +1839,12 @@ static bool __zone_watermark_ok(struct z
 		/* At the next order, this order's pages become unavailable */
 		free_pages -= z->free_area[o].nr_free << o;
 
-		/* If CMA's page number of this order was substructed as part
-		   of "zone_page_state(z, NR_FREE_CMA_PAGES)", subtracting
-		   "z->free_area[o].nr_free << o" substructed CMA's page
-		   number of this order again.  So add it back.  */
+		/*
+		 * If CMA's page number of this order was substracted as part
+		 * of "zone_page_state(z, NR_FREE_CMA_PAGES)", subtracting
+		 * "z->free_area[o].nr_free << o" subtracted CMA's page number
+		 * of this order again.  So add it back.
+		 */
 		if (IS_ENABLED(CONFIG_CMA) && free_cma)
 			free_pages += z->free_area[o].cma_nr_free << o;
 
_

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

i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
mm-prevent-endless-growth-of-anon_vma-hierarchy-fix.patch
mm-page_allocc-__alloc_pages_nodemask-dont-alter-arg-gfp_mask.patch
fanotify-dont-recalculate-a-marks-mask-if-only-the-ignored-mask-changed-checkpatch-fixes.patch
fanotify-dont-set-fan_ondir-implicitly-on-a-marks-ignored-mask-checkpatch-fixes.patch
input-route-kbd-leds-through-the-generic-leds-layer.patch
o2dlm-fix-null-pointer-dereference-in-o2dlm_blocking_ast_wrapper.patch
ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir.patch
mm.patch
mm-replace-remap_file_pages-syscall-with-emulation.patch
cma-fix-cmas-page-number-is-substructed-twice-in-__zone_watermark_ok.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
task_mmu-add-user-space-support-for-resetting-mm-hiwater_rss-peak-rss.patch
lib-bitmap-update-bitmap_onto-to-unsigned-checkpatch-fixes.patch
lib-bitmap-change-parameters-of-bitmap_fold-to-unsigned-fix.patch
hexdump-makes-it-return-amount-of-bytes-placed-in-buffer-fix.patch
fs-befs-linuxvfsc-remove-unnecessary-casting-fix.patch
linux-next.patch
drivers-gpio-gpio-zevioc-fix-build.patch
journal_add_journal_head-debug.patch
journal_add_journal_head-debug-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch