Stephen Rothwell <s...@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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
