# < git ls-remote /scratch/git/linus.git refs/heads/master # < git rev-parse tmp/linus remote == local, skipping fetch # < git rev-parse tmp/linus Upstream revision is ccb19d263fd1c9e34948e2158c53eacbff369344 Head not built, building # < git reset --mixed # git branch -D linus Deleted branch linus (was ccb19d2). # git checkout -q -f -b linus tmp/linus # < git ls-files --others --modified # git ls-files --others --modified cmd.log # < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 -f kisskb-version.mk makewrap: Added ccache to CROSS_COMPILE makewrap: Using -j factor 128 # < /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 defconfig makewrap: Added ccache to CROSS_COMPILE makewrap: Using -j factor 128 # /scratch/kisskb/prod/kisskb/kisskb3/backend/makewrap.py ARCH=um O=/scratch/kisskb/prod/kisskb/kisskb3/backend/build/linus_um-defconfig_um-i386 CROSS_COMPILE=/opt/crosstool/gcc-4.2.3-glibc-2.3.6/i386-unknown-linux-gnu/bin/i386-unknown-linux-gnu- SUBARCH=i386 makewrap: Added ccache to CROSS_COMPILE makewrap: Using -j factor 128 GEN /scratch/kisskb/build/linus_um-defconfig_um-i386/Makefile scripts/kconfig/conf --silentoldconfig arch/x86/um/Kconfig CHK include/linux/version.h UPD include/linux/version.h WRAP arch/um/include/generated/asm/bug.h WRAP arch/um/include/generated/asm/cputime.h WRAP arch/um/include/generated/asm/device.h WRAP arch/um/include/generated/asm/futex.h WRAP arch/um/include/generated/asm/emergency-restart.h WRAP arch/um/include/generated/asm/hw_irq.h WRAP arch/um/include/generated/asm/hardirq.h WRAP arch/um/include/generated/asm/kdebug.h WRAP arch/um/include/generated/asm/irq_regs.h WRAP arch/um/include/generated/asm/percpu.h WRAP arch/um/include/generated/asm/sections.h WRAP arch/um/include/generated/asm/topology.h WRAP arch/um/include/generated/asm/xor.h WRAP arch/um/include/generated/asm/ftrace.h GEN /scratch/kisskb/build/linus_um-defconfig_um-i386/Makefile HOSTCC scripts/kallsyms HOSTCC scripts/bin2c CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o SYSHDR arch/x86/syscalls/../include/generated/asm/unistd_32.h SYSHDR arch/x86/syscalls/../include/generated/asm/unistd_64.h SYSTBL arch/x86/syscalls/../include/generated/asm/syscalls_32.h HOSTCC scripts/unifdef HOSTLD scripts/mod/modpost CC arch/x86/um/user-offsets.s CHK include/generated/user_constants.h UPD include/generated/user_constants.h Using /scratch/kisskb/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h CC kernel/bounds.s GEN include/generated/bounds.h CC arch/um/kernel/asm-offsets.s In file included from /scratch/kisskb/src/arch/um/include/shared/registers.h:9, from /scratch/kisskb/src/arch/um/include/asm/processor-generic.h:14, from /scratch/kisskb/src/arch/x86/um/asm/processor.h:20, from /scratch/kisskb/src/arch/um/include/asm/uaccess.h:16, from /scratch/kisskb/src/arch/um/include/asm/thread_info.h:13, from /scratch/kisskb/src/include/linux/thread_info.h:53, from /scratch/kisskb/src/include/linux/preempt.h:9, from /scratch/kisskb/src/include/linux/spinlock.h:50, from /scratch/kisskb/src/include/linux/seqlock.h:29, from /scratch/kisskb/src/include/linux/time.h:8, from /scratch/kisskb/src/include/linux/timex.h:56, from /scratch/kisskb/src/include/linux/sched.h:57, from /scratch/kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:2, from /scratch/kisskb/src/arch/um/kernel/asm-offsets.c:1: /scratch/kisskb/src/arch/x86/um/shared/sysdep/ptrace.h:8: error: redefinition of 'regs_return_value' /scratch/kisskb/src/arch/x86/um/shared/sysdep/ptrace.h:8: error: previous definition of 'regs_return_value' was here In file included from /scratch/kisskb/src/arch/um/include/shared/skas/skas.h:9, from /scratch/kisskb/src/arch/x86/um/asm/elf.h:9, from /scratch/kisskb/src/arch/um/include/asm/uaccess.h:17, from /scratch/kisskb/src/arch/um/include/asm/thread_info.h:13, from /scratch/kisskb/src/include/linux/thread_info.h:53, from /scratch/kisskb/src/include/linux/preempt.h:9, from /scratch/kisskb/src/include/linux/spinlock.h:50, from /scratch/kisskb/src/include/linux/seqlock.h:29, from /scratch/kisskb/src/include/linux/time.h:8, from /scratch/kisskb/src/include/linux/timex.h:56, from /scratch/kisskb/src/include/linux/sched.h:57, from /scratch/kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:2, from /scratch/kisskb/src/arch/um/kernel/asm-offsets.c:1: /scratch/kisskb/src/arch/x86/um/shared/sysdep/ptrace.h:8: error: redefinition of 'regs_return_value' /scratch/kisskb/src/arch/x86/um/shared/sysdep/ptrace.h:8: error: previous definition of 'regs_return_value' was here make[2]: *** [arch/um/kernel/asm-offsets.s] Error 1 make[2]: Target `__build' not remade because of errors. make[1]: *** [prepare0] Error 2 make[1]: Target `_all' not remade because of errors. make: *** [sub-make] Error 2 make: Target `_all' not remade because of errors. ## bisect disabled, NOT bisecting