On Thu, Jun 04, 2009 at 09:49:52AM +0200, Florian Fainelli wrote: > Le Thursday 04 June 2009 01:54:28 Greg KH, vous avez écrit : > > On Tue, May 05, 2009 at 05:32:04PM -0700, David Daney wrote: > > > This patch set introduces the octeon-ethernet driver into the > > > drivers/staging tree. The Octeon is a mips64r2 base multi-core SOC > > > family. > > > > > > The first five patches are small tweaks to the existing octeon support > > > that are required by the ethernet driver. I would expect them to be > > > merged via Ralf's linux-mips.org tree. > > > > > > The last two are the driver, and would probably be merged via the > > > drivers/staging tree. However since they depend on the first five, > > > they probably shouldn't be merged until those five are merged. > > > > Ok, as Ralf doesn't seem to have responded to my previous query, I'll > > just merge the last driver, and mark it CONFIG_BROKEN which you can turn > > off when the infrastructure portions go in. > > > > Sound reasonable? > > Cannot we get this driver merged via David Miller's tree instead ? It has been > rock solid here and does not seem too ugly for a net-next-2.6 inclusion imho. That's up to the submitter, it seemed that they wanted it in staging first for some reason. thanks, greg k-h
