Re: pull-request: mac80211-next 2015-05-29

2015-06-01 Thread Johannes Berg
On Sun, 2015-05-31 at 17:35 -0700, David Miller wrote: > Pulled, but there was a small conflict in include/net/mac80211.h which seemed > trivially resolvable. Take a look and send me a fixup if I got it wrong, > thanks. Looks good - it seems I managed to apply two different docbook fixes to the t

Re: pull-request: mac80211-next 2015-05-29

2015-05-31 Thread David Miller
From: Johannes Berg Date: Fri, 29 May 2015 13:25:14 +0200 > It's been a while since I sent anything for -next, but with the merge > window getting closer I wanted to send a few more things, mostly fixes. > Of course I expect that tomorrow somebody will send an important fix, > but hey :-) Isn't

pull-request: mac80211-next 2015-05-29

2015-05-29 Thread Johannes Berg
Hi Dave, It's been a while since I sent anything for -next, but with the merge window getting closer I wanted to send a few more things, mostly fixes. Of course I expect that tomorrow somebody will send an important fix, but hey :-) johannes The following changes since commit 658358cec93a713061