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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5DE1C32751 for ; Wed, 7 Aug 2019 21:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A8F821872 for ; Wed, 7 Aug 2019 21:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565213278; bh=qIsPVmF/GYciT+NXgQsfrCXseiH7rATJnnCGWlARXqc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=apRrTUOYtfJ5sAS8ndo8Uw7pQJ1hEyfN7DMNmgf6CcdbEybEzr9YrHXr3Ytoxw88Q jAg7Nm/vH3pr3YbkKLqUrvy+OTkAEt9azys8a0XF1Zbt0YqffSI/JNNjTJFhqWNatG bKNvp+MI4T6/QLx/5d/liwcdbJoEvYCdqx70PL3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388886AbfHGV15 (ORCPT ); Wed, 7 Aug 2019 17:27:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:37144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730529AbfHGV15 (ORCPT ); Wed, 7 Aug 2019 17:27:57 -0400 Received: from akpm3.svl.corp.google.com (unknown [104.133.8.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 144D72186A; Wed, 7 Aug 2019 21:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565213276; bh=qIsPVmF/GYciT+NXgQsfrCXseiH7rATJnnCGWlARXqc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=AIcFK2y1KC2COaKg8q00+EtU7rcA7lCc14vce0BDJl8xmLhIW6r5LbH+3Zv2Pv/3j WVfoBD75OJLsRFw6EiWVo0BxzknBHxyclusqg23eBADyu2zVJQzfFXqwNTkXTv3W1W SsUqR83tfhecM6wOyVuqpfow5IqRJgP9gY8j/X3s= Date: Wed, 7 Aug 2019 14:27:55 -0700 From: Andrew Morton To: Song Liu Cc: Randy Dunlap , Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Linux MM Subject: Re: linux-next: Tree for Aug 7 (mm/khugepaged.c) Message-Id: <20190807142755.8211d58d5ecec8082587b073@linux-foundation.org> In-Reply-To: References: <20190807183606.372ca1a4@canb.auug.org.au> <20190807131029.f7f191aaeeb88cc435c6306f@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 7 Aug 2019 21:00:04 +0000 Song Liu wrote: > >> > >> Shall I resend the patch, or shall I send fix on top of current patch? > > > > Either is OK. If the difference is small I will turn it into an > > incremental patch so that I (and others) can see what changed. > > Please find the patch to fix this at the end of this email. It applies > right on top of "khugepaged: enable collapse pmd for pte-mapped THP". > It may conflict a little with the "Enable THP for text section of > non-shmem files" set, which renames function khugepaged_scan_shmem(). > > Also, I found v3 of the set in linux-next. The latest is v4: > > https://lkml.org/lkml/2019/8/2/1587 > https://lkml.org/lkml/2019/8/2/1588 > https://lkml.org/lkml/2019/8/2/1589 It's all a bit confusing. I'll drop mm-move-memcmp_pages-and-pages_identical.patch uprobe-use-original-page-when-all-uprobes-are-removed.patch uprobe-use-original-page-when-all-uprobes-are-removed-v2.patch mm-thp-introduce-foll_split_pmd.patch mm-thp-introduce-foll_split_pmd-v11.patch uprobe-use-foll_split_pmd-instead-of-foll_split.patch khugepaged-enable-collapse-pmd-for-pte-mapped-thp.patch uprobe-collapse-thp-pmd-after-removing-all-uprobes.patch Please resolve Oleg's review comments and resend everything.