From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org,
stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org
Subject: [GIT] net merged into net-next
Date: Wed, 19 Jun 2013 16:57:13 -0700 (PDT) [thread overview]
Message-ID: <20130619.165713.2010181145193961339.davem@davemloft.net> (raw)
'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.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next reply other threads:[~2013-06-19 23:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 23:57 David Miller [this message]
[not found] ` <20130619.165713.2010181145193961339.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2013-06-20 5:37 ` [GIT] net merged into net-next Johannes Berg
-- strict thread matches above, loose matches on Subject: below --
2018-09-05 5:21 David Miller
2018-03-06 6:43 David Miller
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=20130619.165713.2010181145193961339.davem@davemloft.net \
--to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
--cc=johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.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;
as well as URLs for NNTP newsgroup(s).