Messages in this thread | | | Subject | Re: linux-next: manual merge of the xen-two tree with the tip tree | From | Konrad Rzeszutek Wilk <> | Date | Wed, 03 Jul 2013 07:36:59 -0400 |
| |
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.
| |