lkml.org 
[lkml]   [2013]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the xen-two tree with the tip tree
From
Date
Stephen Rothwell <sfr@canb.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.


\
 
 \ /
  Last update: 2013-07-03 14:21    [W:0.433 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site