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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEFA5C77B61 for ; Mon, 24 Apr 2023 12:14:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 390E36B0071; Mon, 24 Apr 2023 08:14:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 349A66B0074; Mon, 24 Apr 2023 08:14:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22F7D6B0075; Mon, 24 Apr 2023 08:14:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 143FE6B0071 for ; Mon, 24 Apr 2023 08:14:14 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B81F216015F for ; Mon, 24 Apr 2023 12:14:13 +0000 (UTC) X-FDA: 80716176786.04.08736FF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 4DEBB4002D for ; Mon, 24 Apr 2023 12:14:10 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Nejt0hIo; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682338452; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ceu/85gKskypn0Mrq4JYlt57CB6zS+y89QBRxsdO88Q=; b=Zr0pa4sB9uW+ZIswCsqX7vj6NsAOzbaOZ9GuMe8IPVjXnMgOw9IWqqfVKL3JGq6GaEJTEu 0+9C9kywp7OkfdY8AFYSeUwP2M8mlhGTqI40bnXSkU/3ONJdgJ1lASIrAX0ERmTSOTEeSR yxu8Nc8t1QomeKlnABj/jl6/zCkJWio= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Nejt0hIo; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682338452; a=rsa-sha256; cv=none; b=IEYj0Wy9Tw9IiKAQcAFeBJyHmSX1DRXRluKZEnP5SnnivaAQWUYViDlAcNl/0xpK1EQKxg Z+ssLmKCG1AOjr+pKBo8mNsxT4FBoMWRrYJKsFi7/WrYid2ZChgLK97J3yxZ5cMDrqKa5m i7n+YFoYJtMDIq84xsVpk2el7ccucdw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Ceu/85gKskypn0Mrq4JYlt57CB6zS+y89QBRxsdO88Q=; b=Nejt0hIo62NyZ1fkh6fD8vRQZF aYMERb5oeaUEbF9TbBbZhTELLP8VnyK34nKzwawbWXzljHpfYAtBqlv2vQrheufsmYpiISOPQTs5s nOwGS36PGHYKP+hWkada6uaztQzsPRNRVXFPOF5kRX7HSj0Sg/TAgVFHuRQVZQ62YO9Z+jrsFgwK3 kj33CAgpr4umMp7NSEUl3PuQJRlffRKtB2WdTGTlp/d70FmdvfOPWt94HguG+hoYxQl95vj1MH+LV ReCUR8nlp1J41hgRB6QUd0EszLhRM/8ntdsGY47OcNZuMV0WBXoHiw3+9qI7SHDpyBsd1xdghW5sj 5WsuNw1A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pqv4v-000QYK-Nj; Mon, 24 Apr 2023 12:13:57 +0000 Date: Mon, 24 Apr 2023 13:13:57 +0100 From: Matthew Wilcox To: Lukas Bulwahn Cc: Guo Ren , Guo Ren , Palmer Dabbelt , linux-riscv@lists.infradead.org, Linux-MM , kernel-janitors , Muchun Song , Andrew Jones , "Aneesh Kumar K.V" , Andrew Morton Subject: Re: In-flight collision: ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP renaming Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4DEBB4002D X-Rspam-User: X-Stat-Signature: db3sp35e14wnm9dqngrt9awhhkf3yq9b X-HE-Tag: 1682338450-230535 X-HE-Meta: U2FsdGVkX1+DGSM8WZOFVKI++GdAzlh+eMwMRXF6mKGGVrUlpxfoIO+rDxxexkT3kpjXZmNyXWMBywhR6NkrgLQJU2wT5s8Ux+n93bYWFyORsDv6TV07K2FhD3sndkuxe1TPf1fQJGXdgfM3W4wbCkQS7tqgyVYm3q5qPg3OATkUFNrRCsmiq+WeDHc4yYp+2Sja4uSuqV45pT4X6Cr7edWCaErVb5eCJ2X13NkWhu92Sw+f2HDTtV1R/oiA9Yah43V0qn/UKH/NWXJqrQ7coroXBlmJRjQyr08/0gNSd1w5SX95vTfkhlozO3IKGhbQA7DLXnYFGptV9fhhPLIu0rl1Kb4jo8sffLu5Wk5nUeK5r/vF7sdbCqPx/tNXwI7T33VrR39HCyL3tsQLUnYXw7gP5qTxvHDm8gz8Bc7TKv0eUtLP4W/9JzltyC3noB1tSG7TdDSjoDxJtINSnXn5ulfm/MGeI5OQkhzhcRyBN1yGJ+wkq93szoz2CwUgGU65mc5iq/v2aNoVFh02Kr1pbE6PiIUw+8OVTG2d1SE/XMOhmOTsSu3lXwWX/o0ZV+mwsr5Yf4rOgQGFcJrX2pTT7AybxTE5kISjNHjsV10jVD4eJZn2On0H2vNhn4woUlrZ06+XNnT2ceCFCaRF/vGFTHeK8/rY21hoEujbPGFWA23s84BClwRrSgQafRNKyBxwBYNYP9FjLnGWJksQz+2AI1HV9uOtLjksHMZzK2SqH8XYMDisCtww51HJqXsUaZtGKX5QFK02cVp1GIy/y7YwtFyFdXt5YfROTgFq1k9i446sEAjIInCDdU3Onm23RCZIYnXfskxpgOr6ZKd6d+0N1/rHCCUo24Le3jY9aCgD/bHnbkUiW1sRWP/FZReLbntjLXp3PwmEOWipBxwvmT0RP4ksz8s8WGaNstaJ9zbetAJ8VsdNRDf9Gx6RrvR/2Nys/RgSyqguFdWhP6z9ttt 4xRfzl52 rTLbeRhU4DmLvi4lDb3BQaICRXfod0fLyhOq5361rBE70t4hLePBWEDeAu7CzHtLh1i8DKALnprvTl1Os9htKLCad63qeRT8snzi5x8HfTrWxb89LyMzDLIaakh4iP+Imx2aaC0x+DE0gOUNlDMd7FGnryEs23BV99FcFUNjXtggM4QuYt46nkd5mkZINLxJwwBK8FJ7piCqbwURiICT7C3U5Z9r6jgm/1E9qLgKXuggbbzDNZl+nPidYsnx39BcysviF X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Apr 24, 2023 at 11:40:25AM +0200, Lukas Bulwahn wrote: > It is easy to fix, adjust this one line to the renaming and 'select > ARCH_WANT_OPTIMIZE_VMEMMAP'. For now, I am just reporting to let you > know; probably, it is best to get a quick fix-up patch with -rc2, once > all the changes landed in -rc1. Actually, it's best that both parties who send a pull request to Linus note this collision and he can fix it in the merge commit.