Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751532AbdHaOCb (ORCPT ); Thu, 31 Aug 2017 10:02:31 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:35063 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbdHaOC2 (ORCPT ); Thu, 31 Aug 2017 10:02:28 -0400 Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree To: Thomas Gleixner , Juergen Gross References: <20170831142654.47f17cd7@canb.auug.org.au> Cc: Stephen Rothwell , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , Linux Kernel Mailing List From: Boris Ostrovsky Message-ID: <1e7c28e3-d0f6-ac40-fb72-7b95d17379f5@oracle.com> Date: Thu, 31 Aug 2017 10:01:23 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 665 Lines: 16 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. -boris