linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Date:	Wed, 03 Jul 2013 07:36:59 -0400
From:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the xen-two tree with the tip tree

Stephen Rothwell <sfr@...b.auug.org.au> wrote:

>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).

Yes.  Thanks for fixing it up. 
-- 
Sent from my Android phone. Please excuse my brevity.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/