From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Date: Fri, 30 Sep 2016 18:14:36 +0200 > Last pull request before the merge window, since it's about to open :) > It seems that everyone finally agreed on the NAN (neighbor awareness > networking) APIs, so we have that, along with some other things. > > Let me know if there's any problem. Johannes, I merged net into net-next before trying to perform this pull and there are a few conflicts which I am not comfortable resolving on my own. Could you please look into this and send me a new pull request with the conflicts resolved? Thanks!
