lkml.org 
[lkml]   [2011]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system?
On 2011-06-01 17:15, Konrad Rzeszutek Wilk wrote:
> On Tue, May 31, 2011 at 09:25:11PM +0200, Jens Axboe wrote:
>> 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 :-)
>
> Can you repull that branch please? I've rebased it on for-linus branch
> and fixed the embarrassing compilation issue it had..

Repulled, and it seems to compile as well this time :-)

--
Jens Axboe



\
 
 \ /
  Last update: 2011-06-02 13:19    [W:0.044 / U:2.380 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site