summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>2023-03-22 09:51:07 +0100
committerMasahiro Yamada <masahiroy@kernel.org>2023-03-23 15:27:40 +0900
commit1073c15fd39e804ad36ff26a7c7d53b0ab51b184 (patch)
treea383e33d1646daa338cf3f7c6f0a62e4a7de5c2f /scripts
parent3ced71d273f8edf07bf01a831a49ca6b988e06b3 (diff)
downloadlinux-stable-1073c15fd39e804ad36ff26a7c7d53b0ab51b184.tar.gz
linux-stable-1073c15fd39e804ad36ff26a7c7d53b0ab51b184.tar.bz2
linux-stable-1073c15fd39e804ad36ff26a7c7d53b0ab51b184.zip
scripts: merge_config: Fix typo in variable name.
${WARNOVERRIDE} was misspelled as ${WARNOVVERIDE}, which caused a shell syntax error in certain paths of the script execution. Fixes: 46dff8d7e381 ("scripts: merge_config: Add option to suppress warning on overrides") Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> Reviewed-by: Mark Brown <broonie@kernel.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kconfig/merge_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 32620de473ad..902eb429b9db 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -145,7 +145,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
NEW_VAL=$(grep -w $CFG $MERGE_FILE)
BUILTIN_FLAG=false
if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then
- ${WARNOVVERIDE} Previous value: $PREV_VAL
+ ${WARNOVERRIDE} Previous value: $PREV_VAL
${WARNOVERRIDE} New value: $NEW_VAL
${WARNOVERRIDE} -y passed, will not demote y to m
${WARNOVERRIDE}