--- Pavel Roskin <proski@xxxxxxx> wrote: > On Mon, 2007-02-19 at 15:48 -0800, Alex Davis wrote: > > --- Pavel Roskin <proski@xxxxxxx> wrote: > > > > > On Mon, 2007-02-19 at 13:48 -0800, Alex Davis wrote: > > > > I go the following Oops with the latest wireless-dev git when starting wpa_supplicant: > > > > > > Wireless topics moved from this list to linux-wireless@xxxxxxxxxxxxxxxx > > > Broadcom drivers are discussed in bcm43xx-dev@xxxxxxxxxxxxxxxxx > > > wireless-dev is horribly broken, and the fixes haven't been merged yet. > > > > > > The current Broadcom driver can be loaded from > > > http://bu3sch.de/git/wireless-dev.git (please load it on top of > > > wireless-dev.git to save bandwidth) > > What command do I use to load Mike's tree on top of wireless-dev? > > This should do it for you: > > git-remote add bcm43xx http://bu3sch.de/git/wireless-dev.git > git-branch bcm43xx > git-config branch.bcm43xx.remote bcm43xx > git-config branch.bcm43xx.merge refs/heads/master > git-checkout bcm43xx > git-pull > > Sorry, I didn't expect it to be so hairy. Perhaps it should be > documented somewhere. > > -- > Regards, > Pavel Roskin I appreciate all the help, but now I'm confused. I got these instructions from Larry Finger: git branch michael git checkout michael git pull http://bu3sch.de/git/wireless-dev.git master And these instructions from Pavel Roskin: git-remote add bcm43xx http://bu3sch.de/git/wireless-dev.git git-branch bcm43xx git-config branch.bcm43xx.remote bcm43xx git-config branch.bcm43xx.merge refs/heads/master git-checkout bcm43xx git-pull Which set of instructions do I use? Are either of these still applicable, seeing as I was asked to pull from Jiri Benc's tree? Thanks I code, therefore I am ____________________________________________________________________________________ Be a PS3 game guru. Get your game face on with the latest PS3 news and previews at Yahoo! Games. http://videogames.yahoo.com/platform?platform=120121 - 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
