Hi Dave,
Today's linux-next merge of the net tree got a conflict in
net/wireless/reg.c between commit
020cf6ba7a91ccc5db359f91e9abba175fd3a0aa ("net/wireless/reg.c: fix bad
WARN_ON in if statement") from the net-current tree and commit
2083c4997b95fffe8d4f71741bef2298810805a3 ("wireless: clean up regulatory
ignore_request function") from the net tree.
The latter removed the code that the former fixed. I assume that this
conflict will be fixed in the net tree soon.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp7dFyHzow3j.pgp
Description: PGP signature
