From: Johannes Berg <johan...@sipsolutions.net> Date: Mon, 22 Jan 2018 14:15:00 +0100
> A few more (only four, really) changes have come in, so I figured > since the merge window hasn't opened yesterday, I'd still send them > to you. > > Please pull and let me know if there's any problem. I had to resolve a conflict in mac80211_hwsim.c, please check my resolution and send me any fixes which are necessary. Thank you.
