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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130703155914.cc0f48d817f4ca02e3bb18a2@canb.auug.org.au>
Date:	Wed, 3 Jul 2013 15:59:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Vrabel <david.vrabel@...rix.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the xen-two tree with the tip tree

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@...b.auug.org.au

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>

Content of type "application/pgp-signature" skipped