Hi Dave,
Today's linux-next merge of the net tree got a conflict in
net/mac80211/debugfs_sta.c between commit
013cd397532e5803a1625954a884d021653da720 ("mac80211: fix a buffer overrun
in station debug code") from Linus' tree and commit
804feeb826f8a32c8c71a09101fae31804b40ad1 ("mac80211: remove aggregation
status write support from debugfs") from the wireless/net tree.
The latter change just removes the code that the former change was
modifying. I used the latter and assume that this will be fixed in your
tree soon.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWz84amqMJ9.pgp
Description: PGP signature
