On Tue, 19 Dec 2017 12:00:12 -0800 Randy Dunlap <rdunlap@xxxxxxxxxxxxx> 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@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
