Merge branch 'linus' into sched/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined mm/huge_memory.c
index c8bde27,a6abd76..4f1a347
--- 1/mm/huge_memory.c
--- 2/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@@ -1078,7 -1078,7 +1078,7 @@@ struct page *follow_trans_huge_pmd(stru
                goto out;
  
        page = pmd_page(*pmd);
-       VM_BUG_ON_PAGE(!PageHead(page), page);
+       VM_BUG_ON_PAGE(!PageHead(page) && !is_zone_device_page(page), page);
        if (flags & FOLL_TOUCH)
                touch_pmd(vma, addr, pmd);
        if ((flags & FOLL_MLOCK) && (vma->vm_flags & VM_LOCKED)) {
@@@ -1116,7 -1116,7 +1116,7 @@@
        }
  skip_mlock:
        page += (addr & ~HPAGE_PMD_MASK) >> PAGE_SHIFT;
-       VM_BUG_ON_PAGE(!PageCompound(page), page);
+       VM_BUG_ON_PAGE(!PageCompound(page) && !is_zone_device_page(page), page);
        if (flags & FOLL_GET)
                get_page(page);
  
@@@ -1168,7 -1168,7 +1168,7 @@@ int do_huge_pmd_numa_page(struct fault_
        }
  
        /* See similar comment in do_numa_page for explanation */
 -      if (!(vma->vm_flags & VM_WRITE))
 +      if (!pmd_write(pmd))
                flags |= TNF_NO_GROUP;
  
        /*