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

[Stephen Rothwell]

Hi Konrad,

Today's linux-next merge of the xen-two tree got a conflict in
arch/x86/xen/time.c between commit 5584880e44e4 ("x86: xen: Sync the
wallclock when the system time is set") from the tip tree and commit
c9d76a24a289 ("xen/time: Don't leak interrupt name when offlining") from
the xen-two tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/xen/time.c
index 7a5671b,a690868..0000000
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/kernel_stat.h>
  #include <linux/math64.h>
  #include <linux/gfp.h>
 +#include <linux/pvclock_gtod.h>
+ #include <linux/slab.h>
  
  #include <asm/pvclock.h>
  #include <asm/xen/hypervisor.h>

Attachment: pgp00000.pgp
Description: PGP signature