linux-next: manual merge of the xen-tip tree with the tip tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the xen-tip tree with the tip tree
Date	2017-03-29 05:40 +0200
Message-ID	<tqcCJ-11n-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the xen-tip tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-29 05:40 +0200

csiph-web