Messages in this thread | | | From | Linus Torvalds <> | Date | Thu, 26 May 2022 20:42:54 -0700 | Subject | Re: mm: change huge_ptep_clear_flush() to return the original pte |
| |
On Thu, May 26, 2022 at 8:36 PM Baolin Wang <baolin.wang@linux.alibaba.com> wrote: > > That is caused by commit: > > 00df1f1a133b ("mm: change huge_ptep_clear_flush() to return the original > pte") > > interacting with commit: > > fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()") > > And Catalin has fixed the conflict with below changes [1], not sure why > it is not merged.
Argh. Nobody informed me (or if they did, I clearly missed it).
> Linus, should I send a proper patch to fix this conflict for you?
Yeah, somebody please send me a proper tested fix-up patch with commit message etc.
Thanks,
Linus
| |