'net' has been merged into 'net-next', the only non-trivial merge
conflict was in wireless.
It has to do with the bug fix that went recently into 'net' to fix the
race that Linus discovered, which overlaps with the 'net-next' locking
changes to nl80211.
I am pretty sure I fixed a bug in those locking changes in my merge
commit, in that the RTNL mutex was not released in all return paths of
nl80211_dump_wiphy().
Please double-check my work.
Thanks.