MIME-Version: 1.0
Message-ID: <6ff0f0d5-534e-4403-80f7-edd228618049@default>
Date: Thu, 23 Jun 2011 09:58:35 -0700 (PDT)
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
References: <20110622144611.a900a000.sfr@canb.auug.org.au
 20110622140642.GD5574@dumpdata.com>
In-Reply-To: <20110622140642.GD5574@dumpdata.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1169
Lines: 30

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