From: Johannes Berg <johan...@sipsolutions.net> Date: Thu, 08 Jun 2017 14:14:15 +0200
> On Thu, 2017-06-08 at 14:10 +0200, Johannes Berg wrote: >> Hi Dave, >> >> Could you do me a favour and merge net into net-next? I want to merge >> that back in order to apply a patch to mac80211-next that otherwise >> conflicts fairly badly with a change in mac80211. > > Wait, forget it. You already did, I just managed to somehow miss that - > sorry for the noise! Great, nothing for me to do!
