Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between commit 3a5a423bb958 ("nl80211: fix attrbuf
access race by allocating a separate one") from the net tree and commit
940d0ac9dbe3 ("cfg80211: fix rtnl leak in wiphy dump error cases") from
the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/wireless/nl80211.c
index 51d660e,e402819..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -1550,7 -1542,7 +1547,8 @@@ static int nl80211_dump_wiphy(struct sk
  
  			netdev = dev_get_by_index(sock_net(skb->sk), ifidx);
  			if (!netdev) {
+ 				rtnl_unlock();
 +				kfree(tb);
  				return -ENODEV;
  			}
  			if (netdev->ieee80211_ptr) {