[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subjectlinux-next: manual merge of the akpm tree with the tip tree
Hi all,

Today's linux-next merge of the akpm tree got a conflict in:


between commit:

66a07b44e765 ("x86/entry: Switch XEN/PV hypercall entry to IDTENTRY")

from the tip tree and patch:

"mm: introduce include/linux/pgtable.h"

from the akpm tree.

I fixed it up (see below) 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.

Stephen Rothwell

diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index ae4d0f283df3..679d7e87a68b 100644
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -26,7 +26,7 @@

#include <asm/paravirt.h>
#include <asm/desc.h>
-#include <asm/pgtable.h>
+#include <linux/pgtable.h>
#include <asm/idtentry.h>
#include <asm/cpu.h>
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2020-05-29 12:59    [W:0.026 / U:6.700 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site