netdev - Re: pull-request: mac80211-next 2018-06-29

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1530391517.7210.1.camel@sipsolutions.net>
Date:   Sat, 30 Jun 2018 22:45:17 +0200
From:   Johannes Berg <johannes@...solutions.net>
To:     David Miller <davem@...emloft.net>
Cc:     netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: mac80211-next 2018-06-29

On Sat, 2018-06-30 at 21:17 +0900, David Miller wrote:
> From: Johannes Berg <johannes@...solutions.net>
> 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.

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