2014-12-03 06:56:07

by Masahiro Yamada

Subject: [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/kconfig/merge_config.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 81b0c61..efa4733 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
echo "Using $INITFILE as base"
cat $INITFILE > $TMP_FILE

-# Merge files, printing warnings on overrided values
+# Merge files, printing warnings on overridden values
for MERGE_FILE in $MERGE_LIST ; do
echo "Merging $MERGE_FILE"
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
--
1.9.1

2015-02-25 14:00:02

by Michal Marek

Subject: Re: [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh

On 2014-12-03 07:55, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <[email protected]>
> ---
>
> scripts/kconfig/merge_config.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to kbuild.git#kconfig, sorry for the delay.

Michal