DoKernelOrg: make sure to remove leftover version file

Signed-off-by: Junio C Hamano <junio@hera.kernel.org>

diff --git a/DoKernelOrg b/DoKernelOrg
index fa296a1470551f29efd0c049870b2152faee9cc1..7083fbbd3a2a3b0eae8dea372d99cbac78ee4e7a 100755 (executable)
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -15,7 +15,6 @@ make clean >/dev/null 2>&1 &&
 git reset --hard &&
 make clean >/dev/null 2>&1 &&
 git checkout master &&
-git pull . origin &&
 make clean >/dev/null 2>&1 &&
 
 case "$1" in
@@ -42,6 +41,7 @@ case "$1" in
        ;;
 
 maint | maint-* | master)
+       rm -f version
        case `hostname` in
        hera.kernel.org)
                narch='x86_64 i386'

diff --git a/Make b/Make
index 74d2f1dc41c63a16e648e6ca4244418685a87329..001992d7bc0519ce345fcd39d775b18cfd759577 100755 (executable)
--- a/Make
+++ b/Make
@@ -49,7 +49,7 @@ do
                        o=-Wold-style-definition ;;
                esac
                O="$O -Werror $o -std=c99 -Wno-pointer-to-int-cast"
-               O="$O -fwrapv -fno-strict-overflow"
+               # O="$O -fwrapv -fno-strict-overflow"
                ;;
        --)
                shift