From: "John W. Linville" <linville@tuxdriver.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
jbenc@suse.cz, softmac-dev@sipsolutions.net,
bcm43xx-dev@lists.berlios.de
Subject: Re: wireless: the contenders
Date: Wed, 18 Jan 2006 15:48:49 -0500 [thread overview]
Message-ID: <20060118204844.GE6583@tuxdriver.com> (raw)
In-Reply-To: <43CEA6EB.6080209@pobox.com>
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@tuxdriver.com
next prev parent reply other threads:[~2006-01-18 20:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-18 20:06 wireless: the contenders John W. Linville
2006-01-18 20:19 ` [Bcm43xx-dev] " Michael Buesch
2006-01-18 20:25 ` John W. Linville
2006-01-18 20:36 ` Jeff Garzik
2006-01-18 20:48 ` John W. Linville [this message]
2006-01-18 20:52 ` Jeff Garzik
2006-01-19 0:19 ` [Bcm43xx-dev] " Johannes Berg
2006-01-19 15:27 ` John W. Linville
2006-01-22 11:57 ` [PATCH] trivial fix Denis Vlasenko
2006-01-22 11:59 ` [PATCH] ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt Denis Vlasenko
[not found] ` <200601221359.31482.vda-BN/BzeNzsW2SlH3FCl+8hg@public.gmane.org>
2006-01-22 12:08 ` Denis Vlasenko
2006-01-22 12:25 ` [Bcm43xx-dev] " Michael Buesch
2006-01-22 12:04 ` Denis Vlasenko
2006-01-22 13:32 ` Patrick McHardy
2006-01-23 14:32 ` [softmac-dev] " Johannes Berg
2006-01-23 19:00 ` Stefan Rompf
2006-01-24 8:06 ` [Bcm43xx-dev] " Denis Vlasenko
2006-01-25 15:44 ` Stuffed Crust
2006-01-26 10:25 ` Denis Vlasenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060118204844.GE6583@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=bcm43xx-dev@lists.berlios.de \
--cc=jbenc@suse.cz \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=softmac-dev@sipsolutions.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.