[CC Johannes] On Tue 19-12-17 09:36:20, Dmitry Vyukov wrote: > Hello, > > syzbot hit the following crash on 80f3359313dfd0e574d0d245dd93a7c3bf39e1fa > git://git.cmpxchg.org/linux-mmots.git master > > failed to run /usr/bin/make [make bzImage -j 32 > CC=/syzkaller/gcc/bin/gcc]: exit status 2 > scripts/kconfig/conf --silentoldconfig Kconfig > CHK include/config/kernel.release > CHK include/generated/uapi/linux/version.h > UPD include/config/kernel.release > CHK scripts/mod/devicetable-offsets.h > CHK include/generated/utsrelease.h > UPD include/generated/utsrelease.h > CHK include/generated/bounds.h > CHK include/generated/timeconst.h > CC arch/x86/kernel/asm-offsets.s > In file included from ./arch/x86/include/asm/cpufeature.h:5:0, > from ./arch/x86/include/asm/thread_info.h:53, > from ./include/linux/thread_info.h:38, > from ./arch/x86/include/asm/preempt.h:7, > from ./include/linux/preempt.h:81, > from ./include/linux/spinlock.h:51, > from ./include/linux/mmzone.h:8, > from ./include/linux/gfp.h:6, > from ./include/linux/slab.h:15, > from ./include/linux/crypto.h:24, > from arch/x86/kernel/asm-offsets.c:9: > ./arch/x86/include/asm/processor.h:340:1: error: version control > conflict marker in file > <<<<<<< HEAD > ^~~~~~~ > ./arch/x86/include/asm/processor.h:346:24: error: field ‘stack’ has > incomplete type > struct SYSENTER_stack stack; > ^~~~~ > ./arch/x86/include/asm/processor.h:347:1: error: version control > conflict marker in file > ======= > ^~~~~~~ > Kbuild:56: recipe for target 'arch/x86/kernel/asm-offsets.s' failed > make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1 > Makefile:1090: recipe for target 'prepare0' failed > make: *** [prepare0] Error 2 -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
