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

Ingo Molnar
2017-03-29T10:42:18Z

* Juergen Gross <jgross@suse.com> wrote:

> On 29/03/17 10:59, Ingo Molnar wrote:
> >
> > * Juergen Gross <jgross@suse.com> wrote:
> >
> >> On 29/03/17 05:35, Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Today's linux-next merge of the xen-tip tree got a conflict in:
> >>>
> >>> arch/x86/xen/enlighten.c
> >>>
> >>> between commits:
> >>>
> >>> 6415813bae75 ("x86/cpu: Drop wp_works_ok member of struct cpuinfo_x86")
> >>> 69218e47994d ("x86: Remap GDT tables in the fixmap section")
> >>> b23adb7d3f7d ("x86/xen/gdt: Use X86_FEATURE_XENPV instead of globals for the GDT fixup")
> >>>
> >>> from the tip tree and commits:
> >>>
> >>> 75cd32d6093e ("x86/xen: split off enlighten_pv.c")
> >>>
> >>> from the xen-tip tree.
> >>>
> >>> I dropped the xen-tip tree for today (see other conflict reports),
> >>> please get together and sort these out, thanks.
>
> Stephen, I have rewound the linux-next branch of xen-tip to its previous
> position. You can re-enable xen-tip.

Thank you!

Ingo