From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: pull-request: mac80211-next 2016-09-30 Date: Mon, 03 Oct 2016 01:54:01 -0400 (EDT) Message-ID: <20161003.015401.1915647209236695770.davem@davemloft.net> References: <1475252077-6165-1-git-send-email-johannes@sipsolutions.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org Return-path: In-Reply-To: <1475252077-6165-1-git-send-email-johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org 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 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!