Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758164Ab1EaTZR (ORCPT ); Tue, 31 May 2011 15:25:17 -0400 Received: from mx1.fusionio.com ([66.114.96.30]:45811 "EHLO mx1.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758096Ab1EaTZO (ORCPT ); Tue, 31 May 2011 15:25:14 -0400 X-ASG-Debug-ID: 1306869913-03d6a512a8284f0001-xx1T2L X-Barracuda-Envelope-From: JAxboe@fusionio.com Message-ID: <4DE54097.7060000@fusionio.com> Date: Tue, 31 May 2011 21:25:11 +0200 From: Jens Axboe MIME-Version: 1.0 To: Konrad Rzeszutek Wilk CC: "linux-kernel@vger.kernel.org" Subject: Re: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system? References: <20110531191039.GA5269@dumpdata.com> X-ASG-Orig-Subj: Re: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system? In-Reply-To: <20110531191039.GA5269@dumpdata.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Barracuda-Connect: mail1.int.fusionio.com[10.101.1.21] X-Barracuda-Start-Time: 1306869913 X-Barracuda-URL: http://10.101.1.180:8000/cgi-mod/mark.cgi X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.65225 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1058 Lines: 27 On 2011-05-31 21:10, Konrad Rzeszutek Wilk wrote: > Hey Jens, > > I've got two tiny fixes for the xen-blkback (see below): > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-jens/xen-blkback.fixes > > and they are based on for-2.6.40/drivers branch. Is that the way you > prefer to pull patches from sub-trees? Or should I rebase it on 3.0-rc1? > Or should send bug-fixes just directly to Linus? Once I send off the big initial merges which are in the version named for-2.6.40/xx branches, anything after that should just be based on my for-linus branch. That's what I use for post-rc1 merges with Linus. But the only real sticking point is that your branch should not contain something that I don't have in my for-linus. And you don't right now, so I just pulled it :-) -- Jens Axboe -- 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/