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: Wed, 12 Apr 2017 14:20:41 +1000 Message-ID: <20170412142041.377473ac@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 , David Vrabel , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Vitaly Kuznetsov List-Id: xen-devel@lists.xenproject.org Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/mmu.c between commit: 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree and commit: 5159dc315db8 ("x86/xen: split off mmu_pv.c") from the xen-tip tree. The code changed in the former was moved to a new file by the latter, so I applied the following merge fix patch. 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. From: Stephen Rothwell Date: Wed, 12 Apr 2017 14:17:58 +1000 Subject: [PATCH] x86/xen: merge fix up for arch/x86/xen/mmu.c code movement Signed-off-by: Stephen Rothwell --- arch/x86/xen/mmu_pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 284d189f40dd..c98bfb9f0248 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include -- 2.11.0 -- Cheers, Stephen Rothwell