[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091201123142.fe6bc824.sfr@canb.auug.org.au>
Date: Tue, 1 Dec 2009 12:31:42 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Johannes Berg <johannes@...solutions.net>,
"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the net tree with the wireless-current
tree
Hi all,
Today's linux-next merge of the net tree got a conflict in net/mac80211/ht.c between commit 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 ("mac80211: fix spurious delBA handling") from the wireless-current tree and commit c951ad3550ab40071bb0f222ba6125845769c08a ("mac80211: convert aggregation to operate on vifs/stas") from the net tree.
I fixed it up (by using the version from the wireless-current tree) and
can carry the fix as necessary. This may well not be correct.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists