On Sat, 2018-06-30 at 21:17 +0900, David Miller wrote:

From: Johannes Berg <redacted>
Date: Fri, 29 Jun 2018 13:59:05 +0200

quoted

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 :-)

:-)

quoted

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.

Huh, sorry, hadn't seen that massive patch, I see it now.

Please send me any necessary fixups if I didn't do it properly.

No need, looks fine. I diffed it to my tree and the only change is the
kcalloc conversion, as expected.

Thanks!

johannes