From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: Re: Re: [GIT PULL] (xen) pm-bug-fixes for 2.6.32 Date: Tue, 22 Mar 2011 16:45:44 +0000 Message-ID: <4D88D238.3040204@goop.org> References: <4D877AE3.5070202@goop.org> <1300801435.21142.28.camel@zakaz.uk.xensource.com> <1ED784B4-2821-4B8D-A240-D29EF88A9FAE@cs.ubc.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1ED784B4-2821-4B8D-A240-D29EF88A9FAE@cs.ubc.ca> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Shriram Rajagopalan Cc: "xen-devel@lists.xensource.com" , Ian Campbell List-Id: xen-devel@lists.xenproject.org On 03/22/2011 02:15 PM, Shriram Rajagopalan wrote: > On 2011-03-22, at 6:43 AM, Ian Campbell wrote: > >> On Mon, 2011-03-21 at 23:10 +0000, Shriram Rajagopalan wrote: >>> On Mon, Mar 21, 2011 at 9:20 AM, Jeremy Fitzhardinge >>> wrote: >>> On 03/21/2011 03:13 AM, Shriram Rajagopalan wrote: >>>> Hi Jeremy, >>>> >>>> Can you please pull >>>> >>>> git://athos.nss.cs.ubc.ca/linux-2.6-pvops.git >>>> >>> xen/pm-bug-fix >>>> #xen/pm-bug-fix is based off xen/next-2.6.32, >>>> commit ea954f6ff4ff5c15c9e2120e86335f6d6490ae0f >>>> "Merge commit 'konrad-xen/for-2.6.32/bug-fixes~1' into >>> xen/next-2.6.32" >>>> All patches in this branch have been merged into upstream >>> kernel. >>> >>> >>> Are they marked to go into the stable/longterm tree, or are we >>> just >>> going to maintain them separately? >>> >>> >>> >>> I think these should go into the longterm tree. I am a bit clueless as >>> to what you >>> exactly mean by "maintaining them separately". I thought next-2.6.32 >>> was meant >>> as a staging area, that later gets pushed to stable-2.6.32.x >> I think Jeremy is asking whether these should go in via the upstream >> "longterm" 2.6.32.y branch rather than only going into the >> xen/next-2.6.32 branch. >> > Thanks Ian. > Jeremy, I am not sure when/if these are going to go into the longterm branch. But I think these should go into xen/next-2.6.32 atleast for the benefit of folks who build both dom0 & domU out of your tree(the "make kernels" target in xen source). I just pulled it into xen/next-2.6.32 since it seems too fiddly properly backport it to plain 2.6.32 and it doesn't really affect many users (since as I understand it these just fix checkpoints, which have probably been broken for a long time without complaints). J