projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f47be1
)
scripts: kconfig: merge_config.sh: fix indentation
author
Daniel Gomez
<da.gomez@samsung.com>
Tue, 10 Mar 2026 11:36:24 +0000
(12:36 +0100)
committer
Nathan Chancellor
<nathan@kernel.org>
Wed, 11 Mar 2026 07:38:06 +0000
(
00:38
-0700)
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>
Link:
https://patch.msgid.link/20260310-fixes-merge-config-v1-2-beaeeaded6bd@samsung.com
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
scripts/kconfig/merge_config.sh
patch
|
blob
|
history
diff --git
a/scripts/kconfig/merge_config.sh
b/scripts/kconfig/merge_config.sh
index
45e6400
..
f08e086
100755
(executable)
--- 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