On Wed, 2013-06-19 at 16:57 -0700, David Miller wrote: > > '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(). Yes. > Please double-check my work. Looks good, thanks. We had a fix for the RTNL mutex bug on its way to you (currently in wireless-next), but this way is good too :-) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
