On 26/10/2023 15:54, Andrew Morton wrote: > On Thu, 26 Oct 2023 15:30:44 +0100 Ryan Roberts <ryan.roberts@xxxxxxx> wrote: > >>>>> Those fixes finally did not make it to 6.6, I was hoping for them to >>>>> land in -rc6 or -rc7: for the future, what should have I done to avoid >>>>> that? >>>> They're merged in Linus's tree. >>>> >>>> 6f1bace9a9fb arm64: hugetlb: fix set_huge_pte_at() to work with all swap entries >>>> 935d4f0c6dc8 mm: hugetlb: add huge page size param to set_huge_pte_at() >>> >>> >>> Oops, sorry, I missed them this morning! >> >> Those two patches that Andrew highlights are the fix I did for arm64. Weren't >> you referring to the corresponding patches you did for riscv, Alex? > > These are in mainline: > > 1de195dd0e05 riscv: fix set_huge_pte_at() for NAPOT mappings when a swap entry is set > 117b1bb0cbc7 riscv: handle VM_FAULT_[HWPOISON|HWPOISON_LARGE] faults instead of panicking Ahh, great - I think they were probably the ones Alex was talking about. > > I'm not sure what happened to your "riscv: hugetlb: convert > set_huge_pte_at() to take vma" - perhaps it was updated. I modified the approach for v2 (pass size param instead of vma) and it got squashed into 935d4f0c6dc8 mm: hugetlb: add huge page size param to set_huge_pte_at(), which is in.
