From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the xen-tip tree with the tip tree Date: Mon, 28 Aug 2017 15:20:16 +1000 Message-ID: <20170828152016.635096c0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Sender: linux-next-owner@vger.kernel.org To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List List-Id: xen-devel@lists.xenproject.org Hi all, Today's linux-next merge of the xen-tip tree got conflicts in: arch/x86/xen/xen-asm.S arch/x86/xen/xen-asm_64.S between commit: edcb5cf84f05 ("x86/paravirt/xen: Remove xen_patch()") from the tip tree and commits: ad5b8c4ba323("xen: get rid of paravirt op adjust_exception_frame") bd830917233b ("paravirt,xen: remove xen_patch()") from the xen-tip tree. I fixed it up (edcb5cf84f05 and bd830917233b ate more or less the same patch, so I just used the latter version files) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell