Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp607156pxy; Sat, 31 Jul 2021 19:04:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYuurwpeGgz2McqRxDrH/C5h3Q/2MQNCltyttb651V91JANOrpqhwwrg5FLdKKduDVEed5 X-Received: by 2002:a05:6e02:1a05:: with SMTP id s5mr2490394ild.232.1627783443560; Sat, 31 Jul 2021 19:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627783443; cv=none; d=google.com; s=arc-20160816; b=BVBTq6LEprz7ATqiW1JTPtJyRKlQP4kv2d6pAtRGNkorU8WKKPxLNrJ1xa65349uuz +GAuu0Ulov3RNRSKixHyvKisFLQDjqg0dsdSuHJ+UI+v7o2EI/iGcKLTepPwy5tilEz8 zyqD8i7VEwItx41mhZq1vEffUhti3gQCYZhrrlqopo4RaRxyWXM/Xr7jocGAoqkcgRXV 85iZg7czG+oiDQO4xhMmIYsqizMyNpWbrWRGu3QDKi63rgig6WELmWRVezLq52628p95 N4L3/AaUtN0mn4D6r/oT+Wg2/HnGHAku2oAjQ10Grd0Fgzqw3lOFfdYK3rsCQ/mFTrhz Wi6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature:dkim-filter; bh=M5f/2kndTytHogm4WHgQP0Blzx9K5vnQCqPWGcEGwmE=; b=qUi3tThqgDdcx8A4Aej5dhF4/qCmMCp1VN8mqFkpEnIcoQiN8pUSPpi/Xx1qgOsnVf vi52KeBs1H1hOzRVV2giM2JVARDScFRRz/bQE5Kdwaoa5UlffnZM07bNlskFQ4HgIxvR 7JwKFYxIUXBh07KxZ+z5LI6in9SU1Ab0RKr7d2CinMW1UiDu/iJodKZPEcA5NlZj/A2f MNyEta1gH7ixMLjXzLq+t4Zfa/1DSiqeSJ8bg+OV5bS7Czu68mYxPnPgSPjVPyvTjUUs YaTZnBI0vCEqpNs9mDXQzcRJN3gvY19gMEeSfGBrtPLxHitZQzI/kJBa9TiSu4JSZOlD XIrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=w3FfOnbS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u15si7764441iot.89.2021.07.31.19.03.52; Sat, 31 Jul 2021 19:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=w3FfOnbS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230147AbhHABw2 (ORCPT + 99 others); Sat, 31 Jul 2021 21:52:28 -0400 Received: from conssluserg-06.nifty.com ([210.131.2.91]:40211 "EHLO conssluserg-06.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229467AbhHABw2 (ORCPT ); Sat, 31 Jul 2021 21:52:28 -0400 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 1711puNi002999; Sun, 1 Aug 2021 10:51:56 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 1711puNi002999 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1627782716; bh=M5f/2kndTytHogm4WHgQP0Blzx9K5vnQCqPWGcEGwmE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=w3FfOnbS+IPxq8HoyJoJ9V8rM0AUOweW9OJ+CFBjeCr61yYvCtz7QZ4NvAviGliK1 aGgLnYKQtOb2VSNy77TaZUJ1k4AnxNhrPE6whkqluClEv16VuqcfhwxLRUa7vhYfuR obLP1nkoIyftp5v6vvFSE+aUCSeqfm3eWA94+0LZVfCwsqvfAhBvmVun/tHvWUZ0cv u09M/QU6u/aDfXzI700RUw+8mfXrtxHF3/QBFAEccJih0xITxL4HkjhwlgFZSluwbo 375YCCuBu7RKKWCEHe/MYY8FTb68XTBQuN67a7EvVNF1k5eMmYMwml1eCuCY5rgYMZ DRLPWK3tjFpiw== X-Nifty-SrcIP: [209.85.214.173] Received: by mail-pl1-f173.google.com with SMTP id k1so15604903plt.12; Sat, 31 Jul 2021 18:51:56 -0700 (PDT) X-Gm-Message-State: AOAM530Ui5J+Tmqrtm2Q4aa4+6ZoIatRxCqi3gTgE9hcrTwe0CwdX6M7 G8RL0oZv5C8Wq+EGin5MN6vJevV8/sq31rQzuY8= X-Received: by 2002:a65:498a:: with SMTP id r10mr1413214pgs.7.1627782715691; Sat, 31 Jul 2021 18:51:55 -0700 (PDT) MIME-Version: 1.0 References: <20201202151238.3776616-1-maennich@google.com> In-Reply-To: From: Masahiro Yamada Date: Sun, 1 Aug 2021 10:51:18 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] scripts: merge_config: add strict mode to fail upon any redefinition To: Lee Jones Cc: Matthias Maennich , open list , "Cc: Android Kernel" , linux-kbuild Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 26, 2021 at 8:01 PM Lee Jones wrote: > > On Sat, 24 Jul 2021, 14:57 Masahiro Yamada, wrote: >> >> On Thu, Jul 22, 2021 at 7:13 PM Lee Jones wrote: >> > >> > Masahiro, >> > >> > On Fri, 21 May 2021 at 10:29, Lee Jones wrote: >> >> >> >> On Wed, 2 Dec 2020 at 15:13, Matthias Maennich wrote: >> >>> >> >>> When merging configuration fragments, it might be of interest to >> >>> identify mismatches (redefinitions) programmatically. Hence add the >> >>> option -s (strict mode) to instruct merge_config.sh to bail out in >> >>> case any redefinition has been detected. >> >>> >> >>> With strict mode, warnings are emitted as before, but the script >> >>> terminates with rc=1. If -y is set to define "builtin having >> >>> precedence over modules", fragments are still allowed to set =m (while >> >>> the base config has =y). Strict mode will tolerate that as demotions >> >>> from =y to =m are ignored when setting -y. >> >>> >> >>> Cc: Masahiro Yamada >> >>> Signed-off-by: Matthias Maennich >> >>> --- >> >>> scripts/kconfig/merge_config.sh | 15 +++++++++++++++ >> >>> 1 file changed, 15 insertions(+) >> >> >> >> >> >> Reviewed-by: Lee Jones >> > >> > >> > Any idea what's holding this up please? >> >> Simply because I hate this script. >> >> >> merge_config.sh itself is a bad hack. >> I do not like to extend it further. > > > Sorry you feel that way Masahiro. I do not know why merge_config was implemented as a separate shell script while all the other functions were contained in the kconfig binary. Anyway... >> Not only this one. >> I saw more people with >> "hey, I came up with a new option for merge_config.sh" >> to do whatever they like to do. >> >> However, it might be too late anyway. >> >> >> So, I can merge this patch if people believe >> it is useful. > > > I know of multiple entities who make good use of the script and this extension. > > My vote is to merge it, but ultimately this is your train set. OK, I decided to not care about it too much. Now applied to linux-kbuild. Thanks. -- Best Regards Masahiro Yamada