* [GIT] net merged into net-next
@ 2013-06-19 23:57 David Miller
2013-06-20 5:37 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2013-06-19 23:57 UTC (permalink / raw)
To: netdev; +Cc: linux-wireless, johannes, stephen
'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().
Please double-check my work.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT] net merged into net-next
2013-06-19 23:57 [GIT] net merged into net-next David Miller
@ 2013-06-20 5:37 ` Johannes Berg
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Berg @ 2013-06-20 5:37 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-wireless, stephen
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT] net merged into net-next
@ 2012-06-13 5:18 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-06-13 5:18 UTC (permalink / raw)
To: netdev; +Cc: linville, linux-wireless
John please double check my work as the only merge hassles
were wireless bits. I'm pretty sure I resolved things in
a reasonable way.
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-20 5:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-19 23:57 [GIT] net merged into net-next David Miller
2013-06-20 5:37 ` Johannes Berg
-- strict thread matches above, loose matches on Subject: below --
2012-06-13 5:18 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox