mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>,
	open list <linux-kernel@vger.kernel.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	lkft-triage@lists.linaro.org,
	Linux regressions mailing list <regressions@lists.linux.dev>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Andrew Morton <akpm@linux-foundation.org>,
	Matthew Wilcox <willy@infradead.org>
Subject: Re: mm: change huge_ptep_clear_flush() to return the original pte
Date: Fri, 27 May 2022 12:56:42 +0800	[thread overview]
Message-ID: <548a60d7-80bb-7551-cdc1-f9a58071a76b@linux.alibaba.com> (raw)
In-Reply-To: <CAHk-=wjgGW_jsjZxKLcKCf4Di22vzJU6K56j0Oe8Td6RgKrc+A@mail.gmail.com>



On 5/27/2022 11:42 AM, Linus Torvalds wrote:
> 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.

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@linux.alibaba.com/

      reply	other threads:[~2022-05-27  4:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-27  2:56 Naresh Kamboju
2022-05-27  3:36 ` Baolin Wang
2022-05-27  3:42   ` Linus Torvalds
2022-05-27  4:56     ` Baolin Wang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=548a60d7-80bb-7551-cdc1-f9a58071a76b@linux.alibaba.com \
    --to=baolin.wang@linux.alibaba.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lkft-triage@lists.linaro.org \
    --cc=naresh.kamboju@linaro.org \
    --cc=regressions@lists.linux.dev \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®