Re: mm: change huge_ptep_clear_flush() to return the original pte

From: Baolin Wang
Date: Fri May 27 2022 - 00:56:30 EST




On 5/27/2022 11:42 AM, Linus Torvalds wrote:
On Thu, May 26, 2022 at 8:36 PM Baolin Wang
<baolin.wang@xxxxxxxxxxxxxxxxx> 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.

Sure. I send out a fix patch [1] which is already tested in linux-next for several days.

[1] https://lore.kernel.org/all/814e20c19b110209ee12ecae7cb05f8a78d021c8.1653625820.git.baolin.wang@xxxxxxxxxxxxxxxxx/