From: Johannes Berg
Date: Mon, 03 Oct 2016 12:07:00 +0200
> On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote:
>>
>> Could you please look into this and send me a new pull request with
>> the conflicts resolved?
>>
>
> Sure, will do (tomorrow, we have a holiday today).
>
> Would you prefe
On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote:
>
> Could you please look into this and send me a new pull request with
> the conflicts resolved?
>
Sure, will do (tomorrow, we have a holiday today).
Would you prefer I send you the merge resolution for your tree, or just
pull in net for a
From: Johannes Berg
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
Hi Dave,
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.
Thanks,
johannes
The following changes sinc
