| Message ID | 20170316095156.31253-1-johannes@sipsolutions.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Johannes Berg <johannes@sipsolutions.net> Date: Thu, 16 Mar 2017 10:51:55 +0100 > Here's the pull request you were waiting for. I went through all my > pending patches but only this one is applicable for net.git at this > time, so it's just a single one. > > Since I didn't have a current base, I forwarded to net.git first > and re-validated the patch there, but you might might have to be > careful if you merge to not fast-fwd on your side (though, even > if you do that, I don't think it matters much). > > Please pull and let me know if there's any problem. I was able to fast-forward pull this, so it should be fine. Thanks!
On Thu, 2017-03-16 at 11:18 -0700, David Miller wrote: > From: Johannes Berg <johannes@sipsolutions.net> > Date: Thu, 16 Mar 2017 10:51:55 +0100 > > > Here's the pull request you were waiting for. I went through all my > > pending patches but only this one is applicable for net.git at this > > time, so it's just a single one. > > > > Since I didn't have a current base, I forwarded to net.git first > > and re-validated the patch there, but you might might have to be > > careful if you merge to not fast-fwd on your side (though, even > > if you do that, I don't think it matters much). > > > > Please pull and let me know if there's any problem. > > I was able to fast-forward pull this, so it should be fine. Great, thanks. I somehow thought that you might _not_ want the fast forward, to preserve where the patch came from, but personally I don't care. Thanks for merging it so quickly! johannes
Hi Dave, Here's the pull request you were waiting for. I went through all my pending patches but only this one is applicable for net.git at this time, so it's just a single one. Since I didn't have a current base, I forwarded to net.git first and re-validated the patch there, but you might might have to be careful if you merge to not fast-fwd on your side (though, even if you do that, I don't think it matters much). Please pull and let me know if there's any problem. Thanks, johannes The following changes since commit 22a0e18eac7a9e986fec76c60fa4a2926d1291e2: net: properly release sk_frag.page (2017-03-15 15:37:45 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-davem-2017-03-16 for you to fetch changes up to ea90e0dc8cecba6359b481e24d9c37160f6f524f: nl80211: fix dumpit error path RTNL deadlocks (2017-03-16 10:30:03 +0100) ---------------------------------------------------------------- Just a single fix, for the RTNL locking issues. ---------------------------------------------------------------- Johannes Berg (1): nl80211: fix dumpit error path RTNL deadlocks net/wireless/nl80211.c | 127 ++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 71 deletions(-)