On Thu, Apr 19, 2007 at 01:53:39AM +0200, Hanno Böck wrote: > Hi, > > On git.kernel.org, there seem to be two active main wireless-trees: > wireless-dev and wireless-2.6. > > Can anyone explain me the meaning of both trees? Is it planned to merge the > work? The wireless-2.6 tree is the current "feeder" tree for pushing wireless patches on their way towards Linus. It only has components that are currently in Linus' tree or (in the case of a new driver) soon will be. The wireless-dev tree is for (ahem) development of wireless components with more freedom than is possible in a tree that feeds upstream. It includes new components like cfg80211 and nl80211 (for wireless hardware configuration) as well as mac80211 (a replacement for the ieee80211softmac component) and the drivers that use mac80211.o The components in the wireless-dev tree have been available in Andrew Morton's -mm tree for most of the 2.6.22 development cycle. FWIW, David Miller has been prodding me to start sending him patches to add some of those components (notably cfg80211 and mac80211) to the upstream kernels. Once that happens and the patches are accepted upstream, then those components will be handled by the wireless-2.6 tree. Once all those components and the mac80211 drivers have made their way upstream, then wireless-2.6 will handle everything and wireless-dev may cease to exist. The exception would be if some new piece of "disruptive" development pops-up that warrants further maintanence of wireless-dev. Hth! John -- John W. Linville linville@xxxxxxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
