From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Vrabel <david.vrabel@citrix.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the xen-two tree with the tip tree
Date: Wed, 03 Jul 2013 07:36:59 -0400 [thread overview]
Message-ID: <38bbecb3-4426-48a1-ba19-805769b15a4c@email.android.com> (raw)
In-Reply-To: <20130703155914.cc0f48d817f4ca02e3bb18a2@canb.auug.org.au>
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.
next prev parent reply other threads:[~2013-07-03 11:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 5:59 Stephen Rothwell
2013-07-03 11:36 ` Konrad Rzeszutek Wilk [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-15 6:28 Stephen Rothwell
2011-03-15 13:50 ` Konrad Rzeszutek Wilk
2011-02-10 3:55 Stephen Rothwell
2011-02-10 12:22 ` Thomas Gleixner
2011-02-10 12:24 ` Ingo Molnar
2011-02-10 15:24 ` Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38bbecb3-4426-48a1-ba19-805769b15a4c@email.android.com \
--to=konrad.wilk@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®