From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2655C433EF for ; Fri, 27 May 2022 04:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242720AbiE0E40 (ORCPT ); Fri, 27 May 2022 00:56:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238400AbiE0E4V (ORCPT ); Fri, 27 May 2022 00:56:21 -0400 Received: from out30-57.freemail.mail.aliyun.com (out30-57.freemail.mail.aliyun.com [115.124.30.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DC4811A32; Thu, 26 May 2022 21:56:18 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0VEVggNJ_1653627374; Received: from 30.32.82.202(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VEVggNJ_1653627374) by smtp.aliyun-inc.com(127.0.0.1); Fri, 27 May 2022 12:56:15 +0800 Message-ID: <548a60d7-80bb-7551-cdc1-f9a58071a76b@linux.alibaba.com> Date: Fri, 27 May 2022 12:56:42 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: mm: change huge_ptep_clear_flush() to return the original pte To: Linus Torvalds Cc: Naresh Kamboju , open list , Linux-Next Mailing List , lkft-triage@lists.linaro.org, Linux regressions mailing list , Stephen Rothwell , Andrew Morton , Matthew Wilcox References: From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/27/2022 11:42 AM, Linus Torvalds wrote: > On Thu, May 26, 2022 at 8:36 PM Baolin Wang > 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/