From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree Date: Thu, 31 Aug 2017 20:30:43 +0200 (CEST) Message-ID: References: <20170831142654.47f17cd7@canb.auug.org.au> <1e7c28e3-d0f6-ac40-fb72-7b95d17379f5@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: <1e7c28e3-d0f6-ac40-fb72-7b95d17379f5@oracle.com> Sender: linux-next-owner@vger.kernel.org To: Boris Ostrovsky Cc: Juergen Gross , Stephen Rothwell , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: xen-devel@lists.xenproject.org On Thu, 31 Aug 2017, Boris Ostrovsky wrote: > On 08/31/2017 08:00 AM, Thomas Gleixner wrote: > > 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. > > > > https://marc.info/?l=linux-kernel&m=150296063131595&w=2 should also be > picked up by the tip tree then since it applies on top of the > adjust_exception_frame patch. I will revert it from Xen tree as well. Juergen folded that fix in and posted a version against tip:x86/apic. It's applied and pushed out now. Thanks to everyone helping with this. tglx