wireless: the contenders
in [Kernel]
|
Prev: [PATCH] spi: simple SPI framework
Next: 2.6.16-rc1-mm3
From: John W. Linville on 18 Jan 2006 16:00 On Wed, Jan 18, 2006 at 03:36:59PM -0500, Jeff Garzik wrote: > John W. Linville wrote: > >The "master" branch of that tree is (mostly) up-to-date w/ Linus, plus > >changes I recently sent to Jeff. Those changes are also available on > >the "upstream-jgarzik" branch, but it is frozen to when I requested > >Jeff's pull. > Typically I do not update 'master' unless I am also updating 'upstream' > with vanilla Linus changes, in order to avoid screwing up the tree heads > and the diff. When I do update 'master' from 'upstream', it is a > trivial matter to then pull those changes into 'upstream': Good info...thanks! FWIW, I have an "origin" branch that corresponds to Linus' tree. I think that probably enables the same kind of usage as you noted...? Thanks, John -- John W. Linville linville(a)tuxdriver.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: John W. Linville on 19 Jan 2006 10:30
On Thu, Jan 19, 2006 at 01:19:40AM +0100, Johannes Berg wrote: > On Wed, 2006-01-18 at 15:06 -0500, John W. Linville wrote: > > > The tree also has "softmac" and "dscape" branches. The "softmac" > > branch includes the Johannes Berg softmac code as well as the the > > BCM43xx driver based upon that code. > > I guess that branch also contains my enhancements to ieee80211, do you > have any intentions of pulling those over to your upstream tree? I > suppose I should rather post them as a series of patches to netdev for > wider consideration. I pulled from the softmac-2.6.git tree. I think there was ieee80211 stuff in there as well, but you probably know better than I do. :-) The history in your tree isn't formatted properly for the kernel, so something would have to be done before that went upstream anyway. I think it would be best for you to post the patches to netdev, including patches covering softmac if you are so inclined. Please be sure to follow kernel patch posting conventions: http://linux.yyz.us/patch-format.html Thanks, John -- John W. Linville linville(a)tuxdriver.com - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |