From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: pull-request: mac80211-next 2018-06-29 Date: Sat, 30 Jun 2018 21:17:28 +0900 (KST) Message-ID: <20180630.211728.888180353537471428.davem@davemloft.net> References: <20180629115906.2045-1-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: <20180629115906.2045-1-johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org> Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org From: Johannes Berg Date: Fri, 29 Jun 2018 13:59:05 +0200 > Here's the next round of -next updates. This includes the promised > HE stuff but it's not all that big in the end, most of it is just > additions to the protocol header file :-) :-) > Please pull and let me know if there's any problem. There was a small merge conflict in net/mac80211/scan.c, I arranged it such that the kcalloc() conversion was preserved. Please send me any necessary fixups if I didn't do it properly. Thanks.