From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: for-4.8/drivers and Linus' tree + staging conflicts? Date: Thu, 21 Jul 2016 10:06:19 -0400 Message-ID: <20160721140619.GI11916@char.us.oracle.com> References: <20160715161904.GA30284@char.us.oracle.com> <4790e021-0695-abd4-9281-4f7342c79e59@fb.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <4790e021-0695-abd4-9281-4f7342c79e59@fb.com> Sender: linux-kernel-owner@vger.kernel.org To: Jens Axboe Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com, bob.liu@oracle.com, david.vrabel@citrix.com List-Id: xen-devel@lists.xenproject.org On Wed, Jul 20, 2016 at 05:48:37PM -0600, Jens Axboe wrote: > On 07/15/2016 10:19 AM, Konrad Rzeszutek Wilk wrote: > >Hey Jens, > > > >I have some patches for Xen block driver that are based on Linus's tree > >which has: > >7b427a5 xen-blkfront: save uncompleted reqs in blkfront_resume() > > > >That particular patch conflicts with your for-4.8/driver branch. > > > >What I was wondering is if: > > > > 1) Do you want me to create a branh for you to pull in your > > for-4.8/drivers that has the above patch (and a resolution)? > > And along with that the rest of the patches I've for 4.8? > > No, I don't want a lot of extra gunk. > > > 2) Or if you are going rebase your 'for-4.8/drivers' branch > > on top of v4.7-rc7 (which will pull in the above commit?) > > Or that, I never rebase those branches. > > > 3) Stash the patches I've in the Xen tip tree (which is > > based on 4.7-rc7) for 4.8 with me putting your Ack on them? > > See below log and the full diff. > > We can do that, or I can stage them for post initial merge (essentially my > for-linus, which I could base on 4.7-rc7 now). I'm fine with either. OK, lets go with this one and we will stick them in xen-tip. Thanks Jens! > > -- > Jens Axboe >