Merge arm64/riscv hugetlbfs contpte support

[bjoto]

Pull request for series with
subject: Merge arm64/riscv hugetlbfs contpte support
version: 2
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=851551

[bjoto]

Upstream branch: 6beb6bc
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=851551
version: 2

[bjoto]

Upstream branch: 6beb6bc
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=851551
version: 2

[bjoto]

Upstream branch: 0bfbc91
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=851551
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=851551
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: riscv: Restore the pfn in a NAPOT pte when manipulated by core mm code
Applying: riscv: Safely remove huge_pte_offset() when manipulating NAPOT ptes
Applying: mm: Use common huge_ptep_get() function for riscv/arm64
Applying: mm: Use common set_huge_pte_at() function for riscv/arm64
Applying: mm: Use common huge_pte_clear() function for riscv/arm64
Applying: mm: Use common huge_ptep_get_and_clear() function for riscv/arm64
Patch failed at 0006 mm: Use common huge_ptep_get_and_clear() function for riscv/arm64
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: sha1 information is lacking or useless (arch/riscv/include/asm/pgtable.h).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict: