netdev - Re: [GIT] net merged into net-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1371706669.8224.2.camel@jlt4.sipsolutions.net>
Date:	Thu, 20 Jun 2013 07:37:49 +0200
From:	Johannes Berg <johannes@...solutions.net>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, linux-wireless@...r.kernel.org,
	stephen@...workplumber.org
Subject: Re: [GIT] net merged into net-next

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 netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html