[folded-merged] mm-slightly-clarify-ksm-logic-in-do_swap_page-fix.patch removed from -mm tree

[folded-merged] mm-slightly-clarify-ksm-logic-in-do_swap_page-fix.patch removed from -mm tree

[Andrew Morton]

The patch titled
     Subject: mm-slightly-clarify-ksm-logic-in-do_swap_page-fix
has been removed from the -mm tree.  Its filename was
     mm-slightly-clarify-ksm-logic-in-do_swap_page-fix.patch

This patch was dropped because it was folded into mm-slightly-clarify-ksm-logic-in-do_swap_page.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-slightly-clarify-ksm-logic-in-do_swap_page-fix

fix comment, per David

Cc: David Hildenbrand <david@redhat.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/memory.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/mm/memory.c~mm-slightly-clarify-ksm-logic-in-do_swap_page-fix
+++ a/mm/memory.c
@@ -3609,11 +3609,11 @@ vm_fault_t do_swap_page(struct vm_fault
 
 	if (swapcache) {
 		/*
-		 * Make sure try_to_free_swap or reuse_swap_page or swapoff did
-		 * not release the swapcache from under us.  The page pin, and
-		 * pte_same test below, are not enough to exclude that.  Even if
-		 * it is still swapcache, we need to check that the page's swap
-		 * has not changed.
+		 * Make sure try_to_free_swap or swapoff did not release the
+		 * swapcache from under us.  The page pin, and pte_same test
+		 * below, are not enough to exclude that.  Even if it is still
+		 * swapcache, we need to check that the page's swap has not
+		 * changed.
 		 */
 		if (unlikely(!PageSwapCache(page) ||
 			     page_private(page) != entry.val))
_

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

mm-slightly-clarify-ksm-logic-in-do_swap_page.patch
mm-huge_memory-remove-stale-locking-logic-from-__split_huge_pmd-fix.patch
mm.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch
mutex-subsystem-synchro-test-module-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch