* mmots build error: version control conflict marker in file
@ 2017-12-19 8:36 Dmitry Vyukov
2017-12-19 9:03 ` Michal Hocko
0 siblings, 1 reply; 7+ messages in thread
From: Dmitry Vyukov @ 2017-12-19 8:36 UTC (permalink / raw)
To: Andrew Morton, Linux-MM, Michal Hocko
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 8:36 mmots build error: version control conflict marker in file Dmitry Vyukov
@ 2017-12-19 9:03 ` Michal Hocko
2017-12-19 20:00 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Michal Hocko @ 2017-12-19 9:03 UTC (permalink / raw)
To: Dmitry Vyukov; +Cc: Andrew Morton, Linux-MM, Johannes Weiner
[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 a??stacka?? 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@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 9:03 ` Michal Hocko
@ 2017-12-19 20:00 ` Randy Dunlap
2017-12-19 20:01 ` Randy Dunlap
2017-12-19 23:53 ` Andrew Morton
0 siblings, 2 replies; 7+ messages in thread
From: Randy Dunlap @ 2017-12-19 20:00 UTC (permalink / raw)
To: Michal Hocko, Dmitry Vyukov; +Cc: Andrew Morton, Linux-MM, Johannes Weiner
On 12/19/2017 01:03 AM, Michal Hocko wrote:
> [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 a??stacka?? 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
>
Wow. arch/x86/include/asm/processor.h around line 340++ looks like this:
<<<<<<< HEAD
struct SYSENTER_stack {
unsigned long words[64];
};
struct SYSENTER_stack_page {
struct SYSENTER_stack stack;
=======
struct entry_stack {
unsigned long words[64];
};
struct entry_stack_page {
struct entry_stack stack;
>>>>>>> linux-next/akpm-base
} __aligned(PAGE_SIZE);
--
~Randy
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 20:00 ` Randy Dunlap
@ 2017-12-19 20:01 ` Randy Dunlap
2017-12-20 9:16 ` Dmitry Vyukov
2017-12-19 23:53 ` Andrew Morton
1 sibling, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2017-12-19 20:01 UTC (permalink / raw)
To: Michal Hocko, Dmitry Vyukov; +Cc: Andrew Morton, Linux-MM, Johannes Weiner
On 12/19/2017 12:00 PM, Randy Dunlap wrote:
> On 12/19/2017 01:03 AM, Michal Hocko wrote:
>> [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 a??stacka?? 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
>>
>
> Wow. arch/x86/include/asm/processor.h around line 340++ looks like this:
>
> <<<<<<< HEAD
> struct SYSENTER_stack {
> unsigned long words[64];
> };
>
> struct SYSENTER_stack_page {
> struct SYSENTER_stack stack;
> =======
> struct entry_stack {
> unsigned long words[64];
> };
>
> struct entry_stack_page {
> struct entry_stack stack;
>>>>>>>> linux-next/akpm-base
> } __aligned(PAGE_SIZE);
That's only in the git tree. The mmots that I get from tarballs/patches
does not have this problem.
--
~Randy
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 20:00 ` Randy Dunlap
2017-12-19 20:01 ` Randy Dunlap
@ 2017-12-19 23:53 ` Andrew Morton
2017-12-20 9:17 ` Dmitry Vyukov
1 sibling, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2017-12-19 23:53 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Michal Hocko, Dmitry Vyukov, Linux-MM, Johannes Weiner
On Tue, 19 Dec 2017 12:00:12 -0800 Randy Dunlap <rdunlap@infradead.org> wrote:
>
> Wow. arch/x86/include/asm/processor.h around line 340++ looks like this:
>
> <<<<<<< HEAD
> struct SYSENTER_stack {
> unsigned long words[64];
> };
>
> struct SYSENTER_stack_page {
> struct SYSENTER_stack stack;
> =======
> struct entry_stack {
> unsigned long words[64];
> };
>
> struct entry_stack_page {
> struct entry_stack stack;
> >>>>>>> linux-next/akpm-base
> } __aligned(PAGE_SIZE);
Yeah, sorry. Normally I fix those my hand in
linux-next-git-rejects.patch but there were sooooooo many yesterday
that I said screwit. That all got resolved in today's pull.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 20:01 ` Randy Dunlap
@ 2017-12-20 9:16 ` Dmitry Vyukov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Vyukov @ 2017-12-20 9:16 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Michal Hocko, Andrew Morton, Linux-MM, Johannes Weiner
On Tue, Dec 19, 2017 at 9:01 PM, Randy Dunlap <rdunlap@infradead.org> wrote:
> On 12/19/2017 12:00 PM, Randy Dunlap wrote:
>> On 12/19/2017 01:03 AM, Michal Hocko wrote:
>>> [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
>>>
>>
>> Wow. arch/x86/include/asm/processor.h around line 340++ looks like this:
>>
>> <<<<<<< HEAD
>> struct SYSENTER_stack {
>> unsigned long words[64];
>> };
>>
>> struct SYSENTER_stack_page {
>> struct SYSENTER_stack stack;
>> =======
>> struct entry_stack {
>> unsigned long words[64];
>> };
>>
>> struct entry_stack_page {
>> struct entry_stack stack;
>>>>>>>>> linux-next/akpm-base
>> } __aligned(PAGE_SIZE);
>
> That's only in the git tree. The mmots that I get from tarballs/patches
> does not have this problem.
FWIW syzbot relies on the git tree, pulling git trees is currently the
only way of getting kernel sources it supports.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mmots build error: version control conflict marker in file
2017-12-19 23:53 ` Andrew Morton
@ 2017-12-20 9:17 ` Dmitry Vyukov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Vyukov @ 2017-12-20 9:17 UTC (permalink / raw)
To: Andrew Morton; +Cc: Randy Dunlap, Michal Hocko, Linux-MM, Johannes Weiner
On Wed, Dec 20, 2017 at 12:53 AM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> On Tue, 19 Dec 2017 12:00:12 -0800 Randy Dunlap <rdunlap@infradead.org> wrote:
>
>>
>> Wow. arch/x86/include/asm/processor.h around line 340++ looks like this:
>>
>> <<<<<<< HEAD
>> struct SYSENTER_stack {
>> unsigned long words[64];
>> };
>>
>> struct SYSENTER_stack_page {
>> struct SYSENTER_stack stack;
>> =======
>> struct entry_stack {
>> unsigned long words[64];
>> };
>>
>> struct entry_stack_page {
>> struct entry_stack stack;
>> >>>>>>> linux-next/akpm-base
>> } __aligned(PAGE_SIZE);
>
> Yeah, sorry. Normally I fix those my hand in
> linux-next-git-rejects.patch but there were sooooooo many yesterday
> that I said screwit. That all got resolved in today's pull.
Thanks. I see that syzbot was able to successfully build mmots today.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-20 9:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-19 8:36 mmots build error: version control conflict marker in file Dmitry Vyukov
2017-12-19 9:03 ` Michal Hocko
2017-12-19 20:00 ` Randy Dunlap
2017-12-19 20:01 ` Randy Dunlap
2017-12-20 9:16 ` Dmitry Vyukov
2017-12-19 23:53 ` Andrew Morton
2017-12-20 9:17 ` Dmitry Vyukov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).