From: Andrew Morton <akpm@linux-foundation.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>,
Dmitry Vyukov <dvyukov@google.com>, Linux-MM <linux-mm@kvack.org>,
Johannes Weiner <hannes@cmpxchg.org>
Subject: Re: mmots build error: version control conflict marker in file
Date: Tue, 19 Dec 2017 15:53:23 -0800 [thread overview]
Message-ID: <20171219155323.7ed0dcfbc89c76eb87aca592@linux-foundation.org> (raw)
In-Reply-To: <7cec6594-94c7-a238-4046-0061a9adc20d@infradead.org>
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>
next prev parent reply other threads:[~2017-12-19 23:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2017-12-20 9:17 ` Dmitry Vyukov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171219155323.7ed0dcfbc89c76eb87aca592@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=dvyukov@google.com \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).