lkml.org 
[lkml]   [2017]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the xen-tip tree with the tip tree
Hi all,

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

arch/x86/xen/mmu.c

between commits:

69218e47994d ("x86: Remap GDT tables in the fixmap section")
907cd4390290 ("x86/xen: Change __xen_pgd_walk() and xen_cleanmfnmap() to support p4d")
f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")

from the tip tree and commit:

48a09cbf855e ("x86/xen: split off mmu_pv.c")

from the xen-tip tree.

I dropped the xen-tip tree for today, please get together and sort
these conflicts out.
--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2017-03-29 05:36    [W:0.036 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site