RE: linux-next: manual merge of the wireless-next tree with thenet-next tree

[Berg, Johannes]

Hi Stephen,

> Today's linux-next merge of the wireless-next tree got a conflict in
> net/wireless/nl80211.c between merge commits from the net-next tree and
> commit 86e8cf98de3e ("nl80211: use small state buffer for wiphy_dump")
> from the wireless-next tree.

Looks good, yes.

> I think I fixed it up (see below, please check) and can carry the fix as
> necessary (no action is required).  I think that my fix means that that commit
> 86e8cf98de3e is missing the extra "rtnl_unlock();", right?

*sigh*, yes, I clearly have issues with the locking in this function, second time here. Sorry about that, I'll put in a fix.

johannes

-- 

Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/