[folded-merged] mm-add-and-use-find_lock_entries-fix.patch removed from -mm tree

[folded-merged] mm-add-and-use-find_lock_entries-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: fix mm-add-and-use-find_lock_entries.patch
has been removed from the -mm tree.  Its filename was
     mm-add-and-use-find_lock_entries-fix.patch

This patch was dropped because it was folded into mm-add-and-use-find_lock_entries.patch

------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: fix mm-add-and-use-find_lock_entries.patch

Link: https://lkml.kernel.org/r/20201124041507.28996-3-willy@infradead.org

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/filemap.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/mm/filemap.c~mm-add-and-use-find_lock_entries-fix
+++ a/mm/filemap.c
@@ -1957,6 +1957,8 @@ unsigned find_lock_entries(struct addres
 				goto put;
 			if (page->mapping != mapping || PageWriteback(page))
 				goto unlock;
+			VM_BUG_ON_PAGE(!thp_contains(page, xas.xa_index),
+					page);
 		}
 		indices[pvec->nr] = xas.xa_index;
 		if (!pagevec_add(pvec, page))
_

Patches currently in -mm which might be from willy@infradead.org are

mm-make-pagecache-tagged-lookups-return-only-head-pages.patch
mm-shmem-use-pagevec_lookup-in-shmem_unlock_mapping.patch
mm-swap-optimise-get_shadow_from_swap_cache.patch
mm-add-fgp_entry.patch
mm-filemap-rename-find_get_entry-to-mapping_get_entry.patch
mm-filemap-add-helper-for-finding-pages.patch
mm-filemap-add-mapping_seek_hole_data.patch
iomap-use-mapping_seek_hole_data.patch
mm-add-and-use-find_lock_entries.patch
mm-add-an-end-parameter-to-find_get_entries.patch
mm-add-an-end-parameter-to-pagevec_lookup_entries.patch
mm-remove-nr_entries-parameter-from-pagevec_lookup_entries.patch
mm-pass-pvec-directly-to-find_get_entries.patch
mm-remove-pagevec_lookup_entries.patch