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 542BDC7618E for ; Mon, 24 Apr 2023 09:40:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A33886B0071; Mon, 24 Apr 2023 05:40:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E3DC6B0074; Mon, 24 Apr 2023 05:40:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D2556B0075; Mon, 24 Apr 2023 05:40:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7CEEB6B0071 for ; Mon, 24 Apr 2023 05:40:40 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 59FCB80334 for ; Mon, 24 Apr 2023 09:40:40 +0000 (UTC) X-FDA: 80715789840.30.283B460 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by imf14.hostedemail.com (Postfix) with ESMTP id A45EE10001D for ; Mon, 24 Apr 2023 09:40:38 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=frFI2484; spf=pass (imf14.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682329238; 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: references:dkim-signature; bh=LujyabMpn2d5pNDJ/5qq2RowvsHuvRO01dfnOaHAMfg=; b=ozkb9rZlhOZI8ZvYaZyfpOcWj6JI/FsBey0ahw8OwIAgNq0DjMtWkZapJHFKyPcscIV35Q oh1eXnLMBGR3pEkkvoeXa4TOhYRfR7P7Q4seoAN5WKBVyRm4y6kqqJngtpeh1BAN1Kcydh BIyq2EWuO1a81DkO0YV/H5SdSkMrBx0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=frFI2484; spf=pass (imf14.hostedemail.com: domain of lukas.bulwahn@gmail.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=lukas.bulwahn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682329238; a=rsa-sha256; cv=none; b=1l9MPqOqnT5vyNFUsrwLo3gpPRV3wYPslS0Cgmw7oNT+QQdYn1OoObDx5MGZHwYYQCiztr eSjZsrjIk+puwUmu/1fY4e3OFf485dKjD/8M83ORoxqZTlPDvxUSlXqb9YHyHwO476dsVr WxDZ5gb/piI1Uk0Suqf84SQF/Yw2IWo= Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-959a3e2dd27so151970066b.3 for ; Mon, 24 Apr 2023 02:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682329237; x=1684921237; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=LujyabMpn2d5pNDJ/5qq2RowvsHuvRO01dfnOaHAMfg=; b=frFI24846pDpSPiJXrXJWh0bSaphVNclGAdPzueexxmWH8+yY7UV/8yXAdIi9gZiHY GmIsCBOnXOZXeAdVk6Iu6anv1IOnarQ6139Y7rU0ac+PIDoADUnEhR2q3aYZ86LUfPLn QRqUu0Et/+qXSLA6w/X7zwRK6KSKpJgPsvV6iaj4E9PUKBD4BD7obUH9RQPP5HK6EFDu XCo7zuU/V1xfxXRjOoY0CkHFCmr/qbYQ4q7g1vSB/h1GaMhj8PVYZx4f3rG1Hi0kAvRd XpITk7F/cngYDl17a98ZKGO3oOd4ee1RY57qe2mJ+ipWfD6zSifzDwik8RfEy+3xRmrB ThlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682329237; x=1684921237; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LujyabMpn2d5pNDJ/5qq2RowvsHuvRO01dfnOaHAMfg=; b=OMJ1+Q9bFHwQRBZz1bQ/4uMp1KKlTIPtriDnY1UkH2YdaGFVYWsCoynUTjqjaQQoxj 61PmekWpogFAi84ZNsIjbm5ikPlsRt5gw57pPWawJ6c5XFUnhwr9uMnhripisrXTY/Ls fHzCECJWW+jgC+NrSOzk95/v9bRorxXKX/KBp5I34r9nqVKt3CuzNcWWH+X8mlnfmVxO lAbdau4s3dM39hN6ejzh8QZHbopDXG0ob4qilNAg4MRUpMI8Rfx/YvBNkDICxgj2aWOu AK+rSN7Z2O4eJU6bLKgwfywU5+JlAVN0+KjEVBkgebciFxpfq5tnHWQE2tzzQVZKprZt Svpg== X-Gm-Message-State: AAQBX9fMptbp1XuYRSDh4jkP3lTYqSIJA9OF78bT6ofnM/I5w1rPDFBV A7qJQ8GYM8dh5P8Gmo7y6ApAfHUxPqY/lm39yaNQOfxvb2M= X-Google-Smtp-Source: AKy350ZUTIn8HTpY0mszT227QXjYxn5o4V65d2N3WGOhz/k1yNV382n3FiHO5GiwIz3+ss8Gt1HiTwVUcs0ybOCGnug= X-Received: by 2002:a17:906:aada:b0:94a:8ead:c7f with SMTP id kt26-20020a170906aada00b0094a8ead0c7fmr8984862ejb.23.1682329236945; Mon, 24 Apr 2023 02:40:36 -0700 (PDT) MIME-Version: 1.0 From: Lukas Bulwahn Date: Mon, 24 Apr 2023 11:40:25 +0200 Message-ID: Subject: In-flight collision: ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP renaming To: Guo Ren , Guo Ren , Palmer Dabbelt , linux-riscv@lists.infradead.org, Linux-MM , kernel-janitors Cc: Muchun Song , Andrew Jones , "Aneesh Kumar K.V" , Andrew Morton Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A45EE10001D X-Stat-Signature: qryr5kgmuwr6ymow1ch8u8jkxgqr43ue X-Rspam-User: X-HE-Tag: 1682329238-68206 X-HE-Meta: U2FsdGVkX1/Hq84ZCG8GthcaFoLv8LtbD0z+io/VArSaWmVjsZXxGU/JUExl08SHmIbX+lyTOGUZuh0oR2rFhlNY01SZE9tp+b0mWyeOWrfVSDUO5NwjNKW/SVqpSoiMdkX/WZxyjc4aqKH3GrKAw41tZTIWCWag5+NrpF8liypRtKfWB0YPJK7rN3c1awFGXqiyxDgosXzvq1UrXgLVA05E3x20tkVxGjdOSQYjkbJTdC8VWCfxSoWp0CuK1MOUi275IrgGVRU5yNpzSqznPZpXCnGD2vvdwEHv/4eLh7+11yL+yEc0CqqEq18OTG27WHxeM3xDXAepUfxqfAIsEjc4pD+y/b8qt9Lq01Ul6XlZBowbtHUiXUQ7PS79WQt65Wpto/Hb0MikvEXR9l+50Xyoy+xWNjKjNAADH4yevOuH+fRXBy4alnmJof/2S+I18DE1u7s0r/qkF5i69tX93NFsbqkaycOAxtDFjHx2pDKdnXZfcjpG0HZ5KfOyzW4G1SxXQs7V4m8sw5/h2CDz2yO2Me+4c/Kxo4qWRV7jFG6bcQs3VVtYUuZe/AuehDb0+itcyVhDTluP147+o6O+hnwn0yl38n+Zqp0/TmgCg52lmNnsxGJoOVlXTj/1GzNuGXnqywMcRUxej2pQQhXIbsET5Q5vXdKAcc3qcQncNLwVKmM/ZhsnlTVTf+xK0tG4gYhPcNUlO3tpkL+cZ41QPBwdDmz9LwREUYUe9sKzDruY3DmLrMbAoHwgBM2K+IlyJ7Uap1m/zBpP15vmutjFC4uwFUD8iM9G7/O6OcZ4H8M+FE9c/m0pzS8Y1I3WbbLdJ0SoZdR5hIxobo9iB9FBs8eNG/OHpTlmqgA2ayDBeitvZjDkrQhJLWZ3sRcSpGGYGXfuL/3o0N0Ovf+RgpMy0OaViLXITMJakSEG5LbqMX73OKf4XQNYkfvQm8rlctZ1wXh9Mwo0mSPrVTWx1Ct h5CveLYr eGIam9B/Rf7EH7ysMUcT/OZJHRULl+1PgVKVMFztzuFRVL+ZL7EuLc2JCznmPH+FTQ3TZGl4GKTugVyCnE/GuAeT0iv6HTaJWMfPbSXjOWds1cq1oOBwuiGq0h+sglBENedsXjVapdQ7zgug0y7ix5mhzUvoCpwtvQQZZ7FZE/5SH+wg/Hkh/gT9AM7E3V0V71OEAExC5bBtoVWe2aW2IP/vOAo8NFdAz4FhU1HlrTxmK4+X2SGjRrnngQzUl7U/Cc19TJYzOHMaavHPZ31ouMRNQrFfXRff94TB+Mu4uqRUVaArKBAJI0aUJTPsNNhoHRmGTPGYNBQKKXb0xaEpLc8+HsCIRG72Yxh37/oVSANsmDoC6a3OEPJ1GIujWhWDc0KLei7ZUcYUDePzdZLAC/bPw6gp+2irG+YfU16XCK8jD8Hl2pTDrzlu00A== 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: 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. Best regards, Lukas