[folded-merged] ksm-count-ksm-merging-pages-for-each-process-fix.patch removed from -mm tree

[folded-merged] ksm-count-ksm-merging-pages-for-each-process-fix.patch removed from -mm tree

[Andrew Morton]

The patch titled
     Subject: ksm-count-ksm-merging-pages-for-each-process-fix
has been removed from the -mm tree.  Its filename was
     ksm-count-ksm-merging-pages-for-each-process-fix.patch

This patch was dropped because it was folded into ksm-count-ksm-merging-pages-for-each-process.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: ksm-count-ksm-merging-pages-for-each-process-fix

fix comment typo, remove BUG_ON()s

Cc: kernel test robot <lkp@intel.com>
Cc: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Cc: xu xin <xu.xin16@zte.com.cn>
Cc: Yang Yang <yang.yang29@zte.com.cn>
Cc: Zeal Robot <zealci@zte.com.cn>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Ohhoon Kwon <ohoono.kwon@samsung.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/mm_types.h |    4 ++--
 mm/ksm.c                 |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

--- a/include/linux/mm_types.h~ksm-count-ksm-merging-pages-for-each-process-fix
+++ a/include/linux/mm_types.h
@@ -657,8 +657,8 @@ struct mm_struct {
 #endif
 #ifdef CONFIG_KSM
 		/*
-		 * Represet how many pages of this process are
-		 * involved in KSM merging.
+		 * Represent how many pages of this process are involved in KSM
+		 * merging.
 		 */
 		unsigned long ksm_merging_pages;
 #endif
--- a/mm/ksm.c~ksm-count-ksm-merging-pages-for-each-process-fix
+++ a/mm/ksm.c
@@ -639,7 +639,6 @@ static void remove_node_from_stable_tree
 		else
 			ksm_pages_shared--;
 
-		BUG_ON(rmap_item->mm == NULL);
 		rmap_item->mm->ksm_merging_pages--;
 
 		VM_BUG_ON(stable_node->rmap_hlist_len <= 0);
@@ -790,7 +789,6 @@ static void remove_rmap_item_from_tree(s
 		else
 			ksm_pages_shared--;
 
-		BUG_ON(rmap_item->mm == NULL);
 		rmap_item->mm->ksm_merging_pages--;
 
 		VM_BUG_ON(stable_node->rmap_hlist_len <= 0);
@@ -2027,7 +2025,6 @@ static void stable_tree_append(struct rm
 	else
 		ksm_pages_shared++;
 
-	BUG_ON(rmap_item->mm == NULL);
 	rmap_item->mm->ksm_merging_pages++;
 }
 
_

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

ksm-count-ksm-merging-pages-for-each-process.patch
mm-create-new-mm-swaph-header-file-fix.patch
mm-check-against-orig_pte-for-finish_fault-fix-checkpatch-fixes.patch
mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch
mm-memory_hotplug-refactor-hotadd_init_pgdat-and-try_online_node-checkpatch-fixes.patch
kfence-enable-check-kfence-canary-on-panic-via-boot-param-fix.patch
lib-kstrtoxc-add-false-true-support-to-kstrtobool-fix.patch
mapletree-vs-khugepaged.patch
mm-vmscan-not-necessary-to-re-init-the-list-for-each-iteration-fix.patch
mm-make-minimum-slab-alignment-a-runtime-property-fix.patch
proc-fix-dentry-inode-overinstantiating-under-proc-pid-net-checkpatch-fixes.patch
fs-proc-kcorec-remove-check-of-list-iterator-against-head-past-the-loop-body-fix.patch
add-fat-messages-to-printk-index-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch