From: Johannes Berg <johannes@sipsolutions.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
stephen@networkplumber.org
Subject: Re: [GIT] net merged into net-next
Date: Thu, 20 Jun 2013 07:37:49 +0200 [thread overview]
Message-ID: <1371706669.8224.2.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <20130619.165713.2010181145193961339.davem@davemloft.net>
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
next prev parent reply other threads:[~2013-06-20 5:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 23:57 [GIT] net merged into net-next David Miller
2013-06-20 5:37 ` Johannes Berg [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-13 5:18 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371706669.8224.2.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox