1 Dec 01:23
Re: pull request: wireless-2.6 2009-11-30 (security fixes too)
On Mon, Nov 30, 2009 at 02:08:21PM -0800, Linus Torvalds wrote: > > > On Mon, 30 Nov 2009, John W. Linville wrote: > > > > If a) you have already taken Dave's latest pull request; and, b) you > > don't want to wait for his next one to get the mac80211 security fixes > > from Johannes, then you can at your discretion pull from here: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git security > > Hmm. If I pull the 'security' branch, I get > > drivers/net/wireless/iwlwifi/iwl-tx.c | 10 +++++++++- > include/net/mac80211.h | 6 ++++++ > net/mac80211/agg-rx.c | 4 ---- > net/mac80211/agg-tx.c | 17 ++++++++--------- > net/mac80211/ht.c | 8 +++----- > net/mac80211/ieee80211_i.h | 2 ++ > 6 files changed, 28 insertions(+), 19 deletions(-) > > which does not match what you then descibe in the rest of the email > (changelog and diffstat). > > What you describe seems to be the master branch. > > So I'm not going to pull either, and will wait for confirmation of exactly > what you wanted me to pull. Ha! I confused you...(Continue reading)![]()
RSS Feed