# Re: pull-request: mac80211-next 2016-10-04

- From: David Miller \<hidden\>
- Date: 2016-10-05 00:25:28 
- List: netdev
- Page: https://ratatoskr.run/netdev/2016/10/11031169
- Thread: https://ratatoskr.run/linux-wireless/2016/10/11031169/t.md

```text
From: Johannes Berg <redacted>
Date: Tue,  4 Oct 2016 09:31:28 +0200

> Here's a version with the conflicts resolved - had to jigger some
> code around, but it's all described in the merge commit message.
> 
> Let me know if there's any problem.

Pulled, thanks for resolving this.
```