* [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
@ 2014-12-03 6:55 Masahiro Yamada
2015-02-25 13:59 ` Michal Marek
0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2014-12-03 6:55 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada, Yann E. MORIN, linux-kernel
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
2014-12-03 6:55 [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh Masahiro Yamada
@ 2015-02-25 13:59 ` Michal Marek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Marek @ 2015-02-25 13:59 UTC (permalink / raw)
To: Masahiro Yamada, linux-kbuild; +Cc: Yann E. MORIN, linux-kernel
On 2014-12-03 07:55, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>
> scripts/kconfig/merge_config.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to kbuild.git#kconfig, sorry for the delay.
Michal
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-25 14:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-03 6:55 [PATCH] kconfig: fix a misspelling in scripts/kconfig/merge_config.sh Masahiro Yamada
2015-02-25 13:59 ` Michal Marek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.