* net-2.6.25 is no more...
@ 2008-01-30 5:22 David Miller
2008-01-30 9:03 ` Daniel Lezcano
0 siblings, 1 reply; 11+ messages in thread
From: David Miller @ 2008-01-30 5:22 UTC (permalink / raw)
To: netdev
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 5:22 net-2.6.25 is no more David Miller
@ 2008-01-30 9:03 ` Daniel Lezcano
2008-01-30 13:48 ` David Miller
0 siblings, 1 reply; 11+ messages in thread
From: Daniel Lezcano @ 2008-01-30 9:03 UTC (permalink / raw)
To: David Miller; +Cc: netdev
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 ?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 9:03 ` Daniel Lezcano
@ 2008-01-30 13:48 ` David Miller
2008-01-30 17:38 ` Daniel Lezcano
2008-01-31 6:09 ` Jeff Garzik
0 siblings, 2 replies; 11+ messages in thread
From: David Miller @ 2008-01-30 13:48 UTC (permalink / raw)
To: dlezcano; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 13:48 ` David Miller
@ 2008-01-30 17:38 ` Daniel Lezcano
2008-01-30 18:29 ` Arnaldo Carvalho de Melo
2008-01-31 0:36 ` David Miller
2008-01-31 6:09 ` Jeff Garzik
1 sibling, 2 replies; 11+ messages in thread
From: Daniel Lezcano @ 2008-01-30 17:38 UTC (permalink / raw)
To: David Miller; +Cc: netdev
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 ?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 17:38 ` Daniel Lezcano
@ 2008-01-30 18:29 ` Arnaldo Carvalho de Melo
2008-01-30 19:16 ` Daniel Lezcano
2008-01-31 0:36 ` David Miller
1 sibling, 1 reply; 11+ messages in thread
From: Arnaldo Carvalho de Melo @ 2008-01-30 18:29 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: David Miller, netdev
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 18:29 ` Arnaldo Carvalho de Melo
@ 2008-01-30 19:16 ` Daniel Lezcano
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Lezcano @ 2008-01-30 19:16 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Daniel Lezcano, David Miller, netdev
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
2008-01-30 17:38 ` Daniel Lezcano
2008-01-30 18:29 ` Arnaldo Carvalho de Melo
@ 2008-01-31 0:36 ` David Miller
1 sibling, 0 replies; 11+ messages in thread
From: David Miller @ 2008-01-31 0:36 UTC (permalink / raw)
To: dlezcano; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
@ 2008-01-31 6:09 ` Jeff Garzik
0 siblings, 0 replies; 11+ messages in thread
From: Jeff Garzik @ 2008-01-31 6:09 UTC (permalink / raw)
To: David Miller; +Cc: dlezcano, netdev, linux-wireless, John Linville
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.
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
@ 2008-01-31 6:09 ` Jeff Garzik
0 siblings, 0 replies; 11+ messages in thread
From: Jeff Garzik @ 2008-01-31 6:09 UTC (permalink / raw)
To: David Miller
Cc: dlezcano-NmTC/0ZBporQT0dZR+AlfA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA, John Linville
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
@ 2008-01-31 6:21 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2008-01-31 6:21 UTC (permalink / raw)
To: jeff; +Cc: dlezcano, netdev, linux-wireless, linville
From: Jeff Garzik <jeff@garzik.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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: net-2.6.25 is no more...
@ 2008-01-31 6:21 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2008-01-31 6:21 UTC (permalink / raw)
To: jeff-o2qLIJkoznsdnm+yROfE0A
Cc: dlezcano-NmTC/0ZBporQT0dZR+AlfA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
linville-2XuSBdqkA4R54TAoqtyWWQ
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-01-31 6:21 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-30 5:22 net-2.6.25 is no more David Miller
2008-01-30 9:03 ` Daniel Lezcano
2008-01-30 13:48 ` David Miller
2008-01-30 17:38 ` Daniel Lezcano
2008-01-30 18:29 ` Arnaldo Carvalho de Melo
2008-01-30 19:16 ` Daniel Lezcano
2008-01-31 0:36 ` David Miller
2008-01-31 6:09 ` Jeff Garzik
2008-01-31 6:09 ` Jeff Garzik
2008-01-31 6:21 ` David Miller
2008-01-31 6:21 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.