From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> 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.
