All of lore.kernel.org
 help / color / mirror / Atom feed
* pull-request: mac80211 2017-03-16
@ 2017-03-16  9:51 Johannes Berg
  2017-03-16 18:18 ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2017-03-16  9:51 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless

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(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: pull-request: mac80211 2017-03-16
  2017-03-16  9:51 pull-request: mac80211 2017-03-16 Johannes Berg
@ 2017-03-16 18:18 ` David Miller
  2017-03-17  8:05     ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2017-03-16 18:18 UTC (permalink / raw)
  To: johannes; +Cc: netdev, linux-wireless

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!

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: pull-request: mac80211 2017-03-16
@ 2017-03-17  8:05     ` Johannes Berg
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2017-03-17  8:05 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: pull-request: mac80211 2017-03-16
@ 2017-03-17  8:05     ` Johannes Berg
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2017-03-17  8:05 UTC (permalink / raw)
  To: David Miller
  Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-wireless-u79uwXL29TY76Z2rM5mHXA

On Thu, 2017-03-16 at 11:18 -0700, David Miller wrote:
> From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-03-17  8:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-16  9:51 pull-request: mac80211 2017-03-16 Johannes Berg
2017-03-16 18:18 ` David Miller
2017-03-17  8:05   ` Johannes Berg
2017-03-17  8:05     ` Johannes Berg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.