Merge tag 'v4.17-rc2' into docs-next

Merge -rc2 to pick up the changes to
  Documentation/core-api/kernel-api.rst that hit mainline via the
  networking tree.  In their absence, subsequent patches cannot be
  applied.
This commit is contained in:
Jonathan Corbet
2018-04-27 17:13:20 -06:00
325 changed files with 5662 additions and 2490 deletions

View File

@@ -1374,9 +1374,6 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
if (!pvmw.pte && (flags & TTU_MIGRATION)) {
VM_BUG_ON_PAGE(PageHuge(page) || !PageTransCompound(page), page);
if (!PageAnon(page))
continue;
set_pmd_migration_entry(&pvmw, page);
continue;
}