netdev - Re: pull-request: mac80211-next 2018-01-22

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: <1516635078.2508.38.camel@sipsolutions.net>
Date:   Mon, 22 Jan 2018 16:31:18 +0100
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-01-22

On Mon, 2018-01-22 at 10:17 -0500, David Miller wrote:
> From: Johannes Berg <johannes@...solutions.net>
> Date: Mon, 22 Jan 2018 14:15:00 +0100
> 
> > A few more (only four, really) changes have come in, so I figured
> > since the merge window hasn't opened yesterday, I'd still send them
> > to you.
> > 
> > Please pull and let me know if there's any problem.
> 
> I had to resolve a conflict in mac80211_hwsim.c, please check my
> resolution and send me any fixes which are necessary.

Sorry, my bad, I apologize. I knew about this and didn't think of it
when writing the pull request.

Resolution looks good - I was worried about the destruction order for a
second there, but it doesn't actually matter.

Thanks!

johannes