* some netdev merges coming...
@ 2008-05-14 11:52 David Miller
2008-05-15 7:52 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2008-05-14 11:52 UTC (permalink / raw)
To: netdev
Once all of the pending bug fixes in net-2.6 make their way to Linus's
tree. I plan to do some merging.
First, I'll pull Linus's tree into net-2.6 This will be the base for
future bug fixes, as usual.
Next, I'll pull net-2.6 into net-next-2.6
I got distracted today by some bugs and therefore didn't process
as many patches in my backlog as I would have liked to. I hope
to make up for that tomorrow after I do the merging.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: some netdev merges coming...
2008-05-14 11:52 some netdev merges coming David Miller
@ 2008-05-15 7:52 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-05-15 7:52 UTC (permalink / raw)
To: netdev
From: David Miller <davem@davemloft.net>
Date: Wed, 14 May 2008 04:52:39 -0700 (PDT)
> First, I'll pull Linus's tree into net-2.6 This will be the base for
> future bug fixes, as usual.
>
> Next, I'll pull net-2.6 into net-next-2.6
Both of these merges are now completed.
Thanks to John Linville for help with the net-next-2.6 merge wrt. the
wireless conflicts.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-15 7:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-14 11:52 some netdev merges coming David Miller
2008-05-15 7:52 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).