Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree

From: Thomas Gleixner <[email-masked]>
Date: Thu, 31 Aug 2017 14:00:53 +0200 (CEST)

On Thu, 31 Aug 2017, Juergen Gross wrote:
> > I've applied it on top of tip:x86/apic and fixed up the merge conflicts
> > mindlessly. Patch below.
> > 
> > Juergen, can you please check the result?
> 
> You missed the updates to arch/x86/xen/xen-asm_64.S and the declarations
> of the xen specific trap entries in arch/x86/include/asm/traps.h

I'll try that again later today, unless you beat me to it.

Thanks,

	tglx