The patch titled Subject: merge_config.sh: whitespace cleanup has been removed from the -mm tree. Its filename was merge_configsh-whitespace-cleanup.patch This patch was dropped because it was merged into mainline or a subsystem tree 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 _ Patches currently in -mm which might be from dvhart@xxxxxxxxxxxxxxx are origin.patch linux-next.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