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 B7F9AC77B7C for ; Fri, 5 May 2023 06:16:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0946B6B0075; Fri, 5 May 2023 02:16:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 044416B0078; Fri, 5 May 2023 02:16:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9C3A6B007B; Fri, 5 May 2023 02:16:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by kanga.kvack.org (Postfix) with ESMTP id D62B76B0075 for ; Fri, 5 May 2023 02:16:09 -0400 (EDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0F26563B42 for ; Fri, 5 May 2023 06:16:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7649CC433EF for ; Fri, 5 May 2023 06:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683267368; bh=hrper4WhtLjFNY18UGFgjzsA+mCk03IQ4Jteq7M1Jnc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=qc1OUzYOL54KzabNb7zVzYcpjXyOq+v6EG5saKsoR7ih6oANfnzED/Xoe0BB6royG zklHltMsn7pTqDXVGkyejcrVlh3k6V9UbrfEgxXbwBSdXhLY4WC9noS9I8Z5jfbwYL F3HBkJGRyliTSOfTx//LdoHhP+HS5376R+UBBcskXy8Zyv+YB5/LnFIIciXfS3Qx2I lmQMqWfOXAWRW4F81ahlxFrN4V7qejrNPvqwLm2r+Z/DDFepy0FmPH+NCg9ejWLXbG YrqfTEuonelu2l8klGacDjUJxY0EZe84ar0di4l9Zkr4hkPxLSpjZvg/XS0ov8Q+Cy NJN2vz3BxJj2w== Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-9505214c47fso240585966b.1 for ; Thu, 04 May 2023 23:16:08 -0700 (PDT) X-Gm-Message-State: AC+VfDwWAex/sCiLaJyX/D9LcGjZjLnPVtLXgO695ER3/lCQ4C09g2zS LovQaKKwlISHdNYzcLlUiwxxTiMm1suU3CjA71U= X-Google-Smtp-Source: ACHHUZ6RfU0q/eWQU+IF/RV0AY+yhq6TUsivMtMzC8Rgkla6BMNJdv8oIeorZBtaL7imZBSIYYh4jNrIjXnXmgO7NxI= X-Received: by 2002:a17:907:3f9a:b0:961:be96:b093 with SMTP id hr26-20020a1709073f9a00b00961be96b093mr213111ejc.36.1683267366674; Thu, 04 May 2023 23:16:06 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Guo Ren Date: Fri, 5 May 2023 14:15:55 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: In-flight collision: ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP renaming To: Lukas Bulwahn Cc: Guo Ren , Palmer Dabbelt , linux-riscv@lists.infradead.org, Linux-MM , kernel-janitors , Muchun Song , Andrew Jones , "Aneesh Kumar K.V" , Andrew Morton Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 5:40=E2=80=AFPM Lukas Bulwahn wrote: > > Dear Guo Ren, dear Palmer, > > on linux-next, I have noticed that you have submitted and added the > commit a3c7d6b642e4 ("riscv: mm: hugetlb: Enable > ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP"), that adds the select > ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP to the RISCV config. As it > seems, Aneesh Kumar K.V has concurrently renamed this config > throughout the tree with commit 215218dddd25 ("mm/hugetlb_vmemmap: > rename ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP"), but your commit was > not visible to that renaming. When both commits are merged in a common > tree---as happens with linux-next, and will soon happen with Linus' > tree, your commit a3c7d6b642e4 will do nothing (select no existing > config anymore). > > 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. Thx for taking care; please fix that. > > > Best regards, > > Lukas --=20 Best Regards Guo Ren