From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: Re: TMEM + pv_ops kernel?
Date: Sat, 15 May 2010 16:07:38 -0700
Message-ID: <4BEF293A.3070805@goop.org>
References: <4BEC7A56.1050707@buzz-media.com>	<614bc626-d7e1-449a-bcbe-3f783f52dcd6@default	4BEDD0E0.8070502@buzz-media.com>
	<e6ea2ed9-6f1d-4107-9b02-b473b840e3a3@default
	4BEEFE17.9060509@goop.org>
	<b7fac401-162b-428a-9db5-05a08f5a0c49@default>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <b7fac401-162b-428a-9db5-05a08f5a0c49@default>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Rick Boone <rick@buzz-media.com>, xen-devel@lists.xensource.com, konrad.wilk@oracle.com
List-Id: xen-devel@lists.xenproject.org

On 05/15/2010 03:36 PM, Dan Magenheimer wrote:
>> Since the tmem patches seem to be settling down, I was waiting a bit to
>> see if they get into an upstreamable state for this next merge window
>> (though that's getting pretty tight at this point). But if we can set
>> up
>> a git branch based on 2.6.32 we should be able to easily merge it into
>> all the various pvops branches. Are there any tmem changes needed
>> between .32 and later kernels?
>>     
> Sometimes the patches don't apply perfectly cleanly to later kernels,
> but maybe git automatically handles merges better than "patch"?
>   

Yeah, that shouldn't be a problem.

    J