Re: Kernel bug in bcm43xx-d80211

[Pavel Roskin <proski@gnu.org>]

On Mon, 2007-02-19 at 16:40 -0800, Alex Davis wrote:

> 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?

The only difference is that I provided git-remote and git-config
commands that would change the configuration to make "git pull" work
every time without arguments on both branches, whereas if you follow
Larry's instructions, you'll need to provide the URL and the branch to
merge every time you are on the "michael" branch.

The name of the branch is different, but it's your choice.  "git-XXX" is
equivalent to "git XXX", but I prefer the former because bash will
complete the command.  Again, it doesn't really matter.

-- 
Regards,
Pavel Roskin