Resending both patches in one series now, easier for everybody that way.
Conflicts: * "mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw()" -> The change in mm/shmem.c does not exist yet. -> Small contextual conflict. * "mm: don't install PMD mappings when THPs are disabled by the hw/process/vma" -> Small contextual conflict.
v1 -> v2: * "mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw()" -> Keep using "return false;" instead of "return 0;"
David Hildenbrand (1): mm: don't install PMD mappings when THPs are disabled by the hw/process/vma
Kefeng Wang (1): mm: huge_memory: add vma_thp_disabled() and thp_disabled_by_hw()
include/linux/huge_mm.h | 18 ++++++++++++++++++ mm/huge_memory.c | 13 +------------ mm/memory.c | 9 +++++++++ 3 files changed, 28 insertions(+), 12 deletions(-)