The patch titled Subject: merge_config.sh: whitespace cleanup has been added to the -mm tree. Its filename is merge_configsh-whitespace-cleanup.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: whitespace cleanup Fix whitespace usage in the clean_up routine. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN scripts/kconfig/merge_config.sh~merge_configsh-whitespace-cleanup scripts/kconfig/merge_config.sh --- a/scripts/kconfig/merge_config.sh~merge_configsh-whitespace-cleanup +++ a/scripts/kconfig/merge_config.sh @@ -21,8 +21,8 @@ # See the GNU General Public License for more details. clean_up() { - rm -f $TMP_FILE - exit + rm -f $TMP_FILE + exit } trap clean_up HUP INT TERM _ Subject: Subject: merge_config.sh: whitespace cleanup 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