John W. Linville wrote:
The following changes since commit 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908:
John W. Linville:
Merge branch 'upstream-fixes' into upstream
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
upstream
Marcin Juszkiewicz:
hostap: new pcmcia IDs
drivers/net/wireless/hostap/hostap_cs.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
WTF??? I pull, and see diffstat:
Merge db21e578e551421d76641d72cb3f8296ed3f9e61, made by recursive.
drivers/net/wireless/airo.c | 2
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 8 +-
drivers/net/wireless/hostap/hostap_80211_tx.c | 1
drivers/net/wireless/hostap/hostap_ap.c | 11 --
drivers/net/wireless/hostap/hostap_cs.c | 6 +
drivers/net/wireless/hostap/hostap_main.c | 2
drivers/net/wireless/orinoco_cs.c | 33 ++----
drivers/net/wireless/orinoco_nortel.c | 5 +
drivers/net/wireless/orinoco_pci.c | 5 +
drivers/net/wireless/orinoco_pci.h | 31 +-----
drivers/net/wireless/orinoco_plx.c | 5 +
drivers/net/wireless/orinoco_tmd.c | 5 +
drivers/net/wireless/spectrum_cs.c | 33 ++----
include/net/ieee80211softmac.h | 38 ++++++-
net/ieee80211/ieee80211_wx.c | 2
net/ieee80211/softmac/ieee80211softmac_assoc.c | 72 +++++++-------
net/ieee80211/softmac/ieee80211softmac_auth.c | 3 +
net/ieee80211/softmac/ieee80211softmac_module.c | 117
+++++++++++++++++++----
net/ieee80211/softmac/ieee80211softmac_priv.h | 6 +
net/ieee80211/softmac/ieee80211softmac_wx.c | 6 +
20 files changed, 228 insertions(+), 163 deletions(-)
This is vastly different from any 'pull upstream' email I've received
from you. It is extremely uncool for me to pull, and receive something
other than what your email specified.
Nonetheless, I looked over the changes and they look OK, so I took the
lazy route and kept them.
For the future, I would perhaps recommend creating an upstream-jeff
branch at the time of submission, if you insist upon continuing to push
stuff into the upstream branch in the window between submission and
pull. I do this with Linus: I create an 'upstream-linus' branch,
branched off of 'upstream', at the time of submission. After Linus
pulls, I delete the branch.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
