Linville update wireless-2.6/everything

[Holger Schurig]

On Tuesday 04 December 2007 15:49:55 David Woodhouse wrote:
> On Tue, 2007-12-04 at 15:36 +0100, Holger Schurig wrote:
> > wireless-2.6/everything now contains all patches from me
> > that Dan acked.
>
> Argh.
>
> John, please could you hold off on applying libertas patches.
> We're putting put them in the libertas git tree. You can pull
> that into a 'libertas' branch of your own tree, if you want
> them to end up in your 'everything' branch. Please don't
> rebase (even when you incorporate stuff into the 'everything'
> branch); just pull.

The new libertas-2.6 tree is missing some patches that are in 
wireless-2.6/everything:


commit 32382e2a65acda51d11332f0b6fd7b9b4121eeb0
Author: Andres Salomon <dilinger at debian.org>
Date:   Tue Nov 20 17:43:45 2007 -0500
Subject: libertas: mark module_init/exit functions as 
__init/__exit

commit e61d3c2285c25a425182b4032447740d4fb0286b
Author: Andres Salomon <dilinger at debian.org>
Date:   Tue Nov 20 17:44:04 2007 -0500
Subject: libertas: nuke useless variable usbdriver_name and 
useless comments

commit 596a1a897807b34222e3fe6a802936c50d35f976
Author: Brajesh Dave <brajeshd at marvell.com>
Date:   Tue Nov 20 17:44:14 2007 -0500
Subject: libertas: separate mesh connectivity from that of the 
main interface

commit fa3aaa9c486424a11ee3994d2f2f2025ac20d5d9
Author: Brajesh Dave <brajeshd at marvell.com>
Date:   Tue Nov 20 17:44:28 2007 -0500
Subject: libertas: configurable beacon interval



That makes my experimental new-scan.patch apply to one tree, but 
fail to the other. It might also harm future patches ...