Meaning of two trees wireless-dev and wireless-2.6

Meaning of two trees wireless-dev and wireless-2.6

[Hanno Böck]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

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?

-- 
Hanno Böck		Blog:   http://www.hboeck.de/
GPG: 3DBD3B20		Jabber: jabber@hboeck.de

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Meaning of two trees wireless-dev and wireless-2.6

[John W. Linville]

On Thu, Apr 19, 2007 at 01:53:39AM +0200, Hanno B=F6ck wrote:
> Hi,
>=20
> On git.kernel.org, there seem to be two active main wireless-trees:=20
> wireless-dev and wireless-2.6.
>=20
> Can anyone explain me the meaning of both trees? Is it planned to mer=
ge the=20
> 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
--=20
John W. Linville
linville@tuxdriver.com
-
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html