+ merge_configsh-use-signal-names-compatible-with-dash-and-bash.patch added to -mm tree

[akpm@xxxxxxxxxxxxxxxxxxxx]

The patch titled
     Subject: merge_config.sh: use signal names compatible with dash and bash
has been added to the -mm tree.  Its filename is
     merge_configsh-use-signal-names-compatible-with-dash-and-bash.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Subject: merge_config.sh: use signal names compatible with dash and bash

The SIGHUP SIGINT and SIGTERM names caused failures when running
merge_config.sh with the dash shell.  Dropping the "SIG" component makes
the script work in both bash and dash.

Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>
Acked-by: John Stultz <john.stultz@xxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

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

diff -puN scripts/kconfig/merge_config.sh~merge_configsh-use-signal-names-compatible-with-dash-and-bash scripts/kconfig/merge_config.sh
--- a/scripts/kconfig/merge_config.sh~merge_configsh-use-signal-names-compatible-with-dash-and-bash
+++ a/scripts/kconfig/merge_config.sh
@@ -24,7 +24,7 @@ clean_up() {
        rm -f $TMP_FILE
        exit
 }
-trap clean_up SIGHUP SIGINT SIGTERM
+trap clean_up HUP INT TERM
 
 usage() {
 	echo "Usage: $0 [OPTIONS] [CONFIG [...]]"
_
Subject: Subject: merge_config.sh: use signal names compatible with dash and bash

Patches currently in -mm which might be from dvhart@xxxxxxxxxxxxxxx are

linux-next.patch
kconfig-add-merge_configsh-script.patch
merge_configsh-use-signal-names-compatible-with-dash-and-bash.patch
merge_configsh-whitespace-cleanup.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html