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

Stephen Rothwell 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 whe

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 t