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

Stephen Rothwell
2016-07-18T06:17:09Z

Hi all,

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

arch/arm/xen/enlighten.c

between commit:

4761adb6f490 ("arm/xen: Convert to hotplug state machine")

from the tip tree and commit:

ecb23dc6f2ef ("xen: add steal_clock support on x86")

from the xen-tip 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.

--
Cheers,
Stephen Rothwell

diff --cc arch/arm/xen/enlighten.c
index d822e2313950,2f4c3aa540eb..000000000000
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@@ -334,8 -414,12 +397,8 @@@ static int __init xen_guest_init(void
return -EINVAL;
}

- pv_time_ops.steal_clock = xen_stolen_accounting;
- static_key_slow_inc(&paravirt_steal_enabled);
- xen_percpu_init();
-
- register_cpu_notifier(&xen_cpu_notifier);
-
+ xen_time_setup_guest();
+
if (xen_initial_domain())
pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier);