From: Daniel Gomez <da.gomez@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nsc@kernel.org>,
Anders Roxell <anders.roxell@linaro.org>,
Mikko Rapeli <mikko.rapeli@linaro.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 2/3] scripts: kconfig: merge_config.sh: fix indentation
Date: Tue, 10 Mar 2026 12:36:24 +0100 [thread overview]
Message-ID: <20260310-fixes-merge-config-v1-2-beaeeaded6bd@samsung.com> (raw)
In-Reply-To: <20260310-fixes-merge-config-v1-0-beaeeaded6bd@samsung.com>
From: Daniel Gomez <da.gomez@samsung.com>
Replace spaces with tabs for consistency with the rest of the script.
Fixes: 5fa9b82cbcfc5 ("scripts: kconfig: merge_config.sh: refactor from shell/sed/grep to awk")
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
scripts/kconfig/merge_config.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 5177bde69c1d..95f090b88e8d 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -196,7 +196,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
# First pass: read merge file, store all lines and index
FILENAME == ARGV[1] {
- mergefile = FILENAME
+ mergefile = FILENAME
merge_lines[FNR] = $0
merge_total = FNR
cfg = get_cfg($0)
@@ -217,7 +217,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
next
}
- prev_val = $0
+ prev_val = $0
new_val = merge_cfg[cfg]
# BUILTIN: do not demote y to m
--
2.53.0
next prev parent reply other threads:[~2026-03-10 11:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-10 11:36 [PATCH 0/3] Fix merge_config.sh Daniel Gomez
2026-03-10 11:36 ` [PATCH 1/3] scripts: kconfig: merge_config.sh: pass output file as awk variable Daniel Gomez
2026-03-10 11:36 ` Daniel Gomez [this message]
2026-03-10 11:36 ` [PATCH 3/3] scripts: kconfig: merge_config.sh: use POSIX test operator Daniel Gomez
2026-03-11 7:50 ` [PATCH 0/3] Fix merge_config.sh Nathan Chancellor
2026-03-23 0:58 ` (subset) " Nathan Chancellor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260310-fixes-merge-config-v1-2-beaeeaded6bd@samsung.com \
--to=da.gomez@kernel.org \
--cc=anders.roxell@linaro.org \
--cc=da.gomez@samsung.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikko.rapeli@linaro.org \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®