From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mukesh Rathor <mukesh.rathor@oracle.com>
Subject: linux-next: manual merge of the tmem tree with the xen-two tree
Date: Thu, 1 Nov 2012 14:41:17 +1100 [thread overview]
Message-ID: <20121101144117.19aa700248df82b512d8d00f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
Hi Konrad,
Today's linux-next merge of the tmem tree got a conflict in
arch/x86/xen/smp.c between commits 1ba23a0f2605 ("xen/smp: Move the
common CPU init code a bit to prep for PVH patch") and 6c6067f26388
("xen/pvh: Extend vcpu_guest_context, p2m, event, and XenBus") from the
xen-two tree and commit 7282a68f5aea ("PVH: Basic and preparatory
changes") from the tmem tree.
I fixed it up (using the xen-two tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-11-01 3:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 3:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-01 3:41 linux-next: manual merge of the tmem tree with the xen-two tree Stephen Rothwell
2012-11-01 3:40 Stephen Rothwell
2012-11-01 13:03 ` Konrad Rzeszutek Wilk
2012-11-01 13:17 ` Stephen Rothwell
2012-11-01 13:19 ` Stephen Rothwell
2012-11-01 21:52 ` Konrad Rzeszutek Wilk
2011-06-22 4:46 Stephen Rothwell
2011-06-22 14:06 ` Konrad Rzeszutek Wilk
2011-06-23 16:58 ` Dan Magenheimer
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=20121101144117.19aa700248df82b512d8d00f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mukesh.rathor@oracle.com \
/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;
as well as URLs for NNTP newsgroup(s).