Hi John,
Today's linux-next merge of the wireless tree got a conflict in
net/mac80211/pm.c between commit 7d42081a271bd8a82f2100524085c4f029e47717
("mac80211: do not print WARN if config interface") from the
wireless-current tree and commit aa3590f6a8ebc24d38698ffb81fb51e97f03c4f4
("mac80211: add hardware restart function") from the wireless tree.
The latter moved the code (to net/mac80211/util.c:ieee80211_reconfig)
that the former modified. I just used the version in the wireless tree
and will leave you to fix this up when the merge happens.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpF8V7ue8B1i.pgp
Description: PGP signature
