net-2.6.25 is no more...

net-2.6.25 is no more...

[David Miller]

Now that the bulk has been merged over and we are
actively working alongside Linus's tree I have moved
all current patch applying to net-2.6 instead of net-2.6.25,
so the current tree to use is:

	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git

Thanks.

Re: net-2.6.25 is no more...

[Daniel Lezcano]

David Miller wrote:
> Now that the bulk has been merged over and we are
> actively working alongside Linus's tree I have moved
> all current patch applying to net-2.6 instead of net-2.6.25,
> so the current tree to use is:
> 
> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git

This tree is for fixes only, right ? or shall we send enhancement 
patches to net-2.6 until net-2.6.26 appears ?

Re: net-2.6.25 is no more...

[David Miller]

From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Wed, 30 Jan 2008 10:03:09 +0100

> David Miller wrote:
> > Now that the bulk has been merged over and we are
> > actively working alongside Linus's tree I have moved
> > all current patch applying to net-2.6 instead of net-2.6.25,
> > so the current tree to use is:
> > 
> > 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
> 
> This tree is for fixes only, right ? or shall we send enhancement 
> patches to net-2.6 until net-2.6.26 appears ?

The latter.

Re: net-2.6.25 is no more...

[Daniel Lezcano]

David Miller wrote:
> From: Daniel Lezcano <dlezcano@fr.ibm.com>
> Date: Wed, 30 Jan 2008 10:03:09 +0100
> 
>> David Miller wrote:
>>> Now that the bulk has been merged over and we are
>>> actively working alongside Linus's tree I have moved
>>> all current patch applying to net-2.6 instead of net-2.6.25,
>>> so the current tree to use is:
>>>
>>> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
>> This tree is for fixes only, right ? or shall we send enhancement 
>> patches to net-2.6 until net-2.6.26 appears ?
> 
> The latter.

What will happen to the patches sent to net-2.6.25 a few days ago during 
the merge ? Should I resend them against net-2.6 ?

Re: net-2.6.25 is no more...

[Arnaldo Carvalho de Melo]

Em Wed, Jan 30, 2008 at 06:38:53PM +0100, Daniel Lezcano escreveu:
> David Miller wrote:
>> From: Daniel Lezcano <dlezcano@fr.ibm.com>
>> Date: Wed, 30 Jan 2008 10:03:09 +0100
>>
>>> David Miller wrote:
>>>> Now that the bulk has been merged over and we are
>>>> actively working alongside Linus's tree I have moved
>>>> all current patch applying to net-2.6 instead of net-2.6.25,
>>>> so the current tree to use is:
>>>>
>>>> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
>>> This tree is for fixes only, right ? or shall we send enhancement patches 
>>> to net-2.6 until net-2.6.26 appears ?
>>
>> The latter.
>
> What will happen to the patches sent to net-2.6.25 a few days ago during 
> the merge ? Should I resend them against net-2.6 ?

They are probably in net-2.6 already, have you checked? I checked and a
fix I sent that was not yet merged by Linus is there, in net-2.6.

- Arnaldo

Re: net-2.6.25 is no more...

[Daniel Lezcano]

Arnaldo Carvalho de Melo wrote:
> Em Wed, Jan 30, 2008 at 06:38:53PM +0100, Daniel Lezcano escreveu:
>> David Miller wrote:
>>> From: Daniel Lezcano <dlezcano@fr.ibm.com>
>>> Date: Wed, 30 Jan 2008 10:03:09 +0100
>>>
>>>> David Miller wrote:
>>>>> Now that the bulk has been merged over and we are
>>>>> actively working alongside Linus's tree I have moved
>>>>> all current patch applying to net-2.6 instead of net-2.6.25,
>>>>> so the current tree to use is:
>>>>>
>>>>> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
>>>> This tree is for fixes only, right ? or shall we send enhancement patches 
>>>> to net-2.6 until net-2.6.26 appears ?
>>> The latter.
>> What will happen to the patches sent to net-2.6.25 a few days ago during 
>> the merge ? Should I resend them against net-2.6 ?
> 
> They are probably in net-2.6 already, have you checked? I checked and a
> fix I sent that was not yet merged by Linus is there, in net-2.6.

I checked net-2.6, but unfortunately they are not in. I sent two 
compilation fix error and a subset of the netns ipv6 routing.

Re: net-2.6.25 is no more...

[David Miller]

From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Wed, 30 Jan 2008 18:38:53 +0100

> David Miller wrote:
> > From: Daniel Lezcano <dlezcano@fr.ibm.com>
> > Date: Wed, 30 Jan 2008 10:03:09 +0100
> > 
> >> David Miller wrote:
> >>> Now that the bulk has been merged over and we are
> >>> actively working alongside Linus's tree I have moved
> >>> all current patch applying to net-2.6 instead of net-2.6.25,
> >>> so the current tree to use is:
> >>>
> >>> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
> >> This tree is for fixes only, right ? or shall we send enhancement 
> >> patches to net-2.6 until net-2.6.26 appears ?
> > 
> > The latter.
> 
> What will happen to the patches sent to net-2.6.25 a few days ago during 
> the merge ? Should I resend them against net-2.6 ?

I have them in my backlog, so just be patient as even just doing
a read-only pass on my email while being here at LCA08 is super
painful.

Re: net-2.6.25 is no more...

[Jeff Garzik]

David Miller wrote:
> From: Daniel Lezcano <dlezcano-NmTC/0ZBporQT0dZR+AlfA@public.gmane.org>
> Date: Wed, 30 Jan 2008 10:03:09 +0100
> 
>> David Miller wrote:
>>> Now that the bulk has been merged over and we are
>>> actively working alongside Linus's tree I have moved
>>> all current patch applying to net-2.6 instead of net-2.6.25,
>>> so the current tree to use is:
>>>
>>> 	kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
>> This tree is for fixes only, right ? or shall we send enhancement 
>> patches to net-2.6 until net-2.6.26 appears ?
> 
> The latter.

So...  what to do about changes which are not bug fixes?  Such changes 
should not go upstream immediately, because that's the standard rule for 
merge windows.

And queueing them on our side just re-creates the same old situation we 
just changed away from, after all.

	Jeff

Re: net-2.6.25 is no more...

[David Miller]

From: Jeff Garzik <jeff-o2qLIJkoznsdnm+yROfE0A@public.gmane.org>
Date: Thu, 31 Jan 2008 01:09:21 -0500

> David Miller wrote:
> > The latter.
> 
> So...  what to do about changes which are not bug fixes?  Such changes 
> should not go upstream immediately, because that's the standard rule for 
> merge windows.
> 
> And queueing them on our side just re-creates the same old situation we 
> just changed away from, after all.

I'm saying that everything should go to the net-2.6 tree right now.

When the merge window closes, net-2.6 will be for bug fixes only and
I'll hold off on creating net-2.6.26 for about a week so that people
concentrate on regression fixes.

Yes, things will pile up but I think it's appropriate to hold off on
merging features into the 2.6.26 queue for just one week.