* READ ME Major net-2.6.24 rebase
@ 2007-09-15 22:39 David Miller
2007-09-15 22:41 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2007-09-15 22:39 UTC (permalink / raw)
To: netdev; +Cc: jeff, linville, akpm
I've fully rebased the tree at:
kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.24.git
Also, I've fully integrated both John Linville's wireless
infrastructure and driver updates, as well as Jeff Garzik's
upstream netdevice changes.
This should resolve all of the merging conflicts that were
occuring between these trees, and from now until the
2.6.24 merge window opens Jeff and I will keep our
trees close together so that there is no divergence.
I've sanity-strapped this thing by doing a make allmodconfig
on sparc64, and I'm running this tree on my SunBlade1500
workstation with no problems so far.
With this much churn there is guarenteed to be a small issue
here or there, and we'll fix those up.
Andrew, this means you can stop pulling in Jeff's tree for the
time being, everything is in my tree above.
Enjoy.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: READ ME Major net-2.6.24 rebase
2007-09-15 22:39 READ ME Major net-2.6.24 rebase David Miller
@ 2007-09-15 22:41 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-09-15 22:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linville, akpm
David Miller wrote:
> Andrew, this means you can stop pulling in Jeff's tree for the
> time being, everything is in my tree above.
ACK
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-15 22:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-15 22:39 READ ME Major net-2.6.24 rebase David Miller
2007-09-15 22:41 ` Jeff Garzik
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).