[folded-merged] mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4.patch removed from -mm tree

[folded-merged] mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4
has been removed from the -mm tree.  Its filename was
     mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4.patch

This patch was dropped because it was folded into mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled.patch

------------------------------------------------------
From: Muchun Song <songmuchun@bytedance.com>
Subject: mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4

if the vma is out of date, just exit

Link: http://lkml.kernel.org/r/20200416025034.29780-1-songmuchun@bytedance.com
Fixes: e86c59b1b12d ("mm/ksm: improve deduplication of zero pages with colouring")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Co-developed-by: Xiongchun Duan <duanxiongchun@bytedance.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Markus Elfring <Markus.Elfring@web.de>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/ksm.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/mm/ksm.c~mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled-v4
+++ a/mm/ksm.c
@@ -2116,7 +2116,11 @@ static void cmp_and_merge_page(struct pa
 			err = try_to_merge_one_page(vma, page,
 					ZERO_PAGE(rmap_item->address));
 		else
-			err = -EFAULT;
+			/**
+			 * If the vma is out of date, we do not need to
+			 * continue.
+			 */
+			err = 0;
 		up_read(&mm->mmap_sem);
 		/*
 		 * In case of failure, the page was not really empty, so we
_

Patches currently in -mm which might be from songmuchun@bytedance.com are

mm-ksm-fix-null-pointer-dereference-when-ksm-zero-page-is-enabled.patch