From: Dan Magenheimer <dan.magenheimer@oracle.com>
To: Konrad Wilk <konrad.wilk@oracle.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: RE: linux-next: manual merge of the tmem tree with the xen-two tree
Date: Thu, 23 Jun 2011 09:58:35 -0700 (PDT) [thread overview]
Message-ID: <6ff0f0d5-534e-4403-80f7-edd228618049@default> (raw)
In-Reply-To: <20110622140642.GD5574@dumpdata.com>
> From: Konrad Rzeszutek Wilk
> Subject: Re: linux-next: manual merge of the tmem tree with the xen-two tree
>
> On Wed, Jun 22, 2011 at 02:46:11PM +1000, Stephen Rothwell wrote:
> > Hi Dan,
> >
> > Today's linux-next merge of the tmem tree got a conflict in
> > drivers/xen/Kconfig drivers/xen/tmem.c between commit afec6e04922d ("xen:
> > prepare tmem shim to handle frontswap") from the xen-two tree and commit
> > ac33c46b42ba ("xen: enable frontswap for Xen tmem") from the tmem tree.
>
> Dan, can you please rebase your #linux-next branch on my #linux-next branch
> so that Stephen's awesome build engine can chug along for this?
>
> Thanks!
> > I just used the xen-two versions of these files (as they look newer).
>
> OK, we will sort this out.
Should hopefully all be fixed now. (Konrad's version of the commit is
indeed the newer version so I have removed the older version from the
tmem tree.)
Thanks,
Dan
next prev parent reply other threads:[~2011-06-23 16:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-22 4:46 linux-next: manual merge of the tmem tree with the xen-two tree Stephen Rothwell
2011-06-22 14:06 ` Konrad Rzeszutek Wilk
2011-06-23 16:58 ` Dan Magenheimer [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2012-11-01 3:41 Stephen Rothwell
2012-11-01 3:41 Stephen Rothwell
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=6ff0f0d5-534e-4403-80f7-edd228618049@default \
--to=dan.magenheimer@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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