[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] linux-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

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.