From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: Re: [PATCH 00 of 10] blkfront pvops updates Date: Thu, 29 Apr 2010 14:10:52 -0700 Message-ID: <4BD9F5DC.4040208@goop.org> References: <4BD9E2EE.5060402@goop.org> <1272571912.25447.11.camel@agari.van.xensource.com> <1272574715.25447.34.camel@agari.van.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1272574715.25447.34.camel@agari.van.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Daniel Stodden Cc: ksrinivasan , Xen , Jan Beulich List-Id: xen-devel@lists.xenproject.org On 04/29/2010 01:58 PM, Daniel Stodden wrote: > Ah, that's where the previous stuff ended up. I thought those probably > just got dropped. > I thought the changes in these patches looked somewhat familiar. > Let's just scratch those. It's been months, so if they didn't make it > back then, they won't need to complicate stuff now either. > > So I should probably merge with xen/frontend. If those matter, they must > be on some branch which matters. Which one is it? I thought the one > which matters is xen/master? Is it xen/next? > The flow of changes is (ideally): -> xen/next -> xen/stable* where "->" is merged into. I'm going to clean things up a bit by re-creating xen/blkfront with the changes from xen/frontend. If you rebase your patches onto xen/frontend then I should be able to easily incorporate them into that cleanup. Sorry for the mixup. Thanks, J