netdev - Re: pull-request: mac80211-next 2019-04-26

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: <01f1037952f77ae1aefc874ad02181fd5fa9c802.camel@sipsolutions.net>
Date:   Fri, 26 Apr 2019 22:13:53 +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 2019-04-26

On Fri, 2019-04-26 at 16:11 -0400, David Miller wrote:
> From: Johannes Berg <johannes@...solutions.net>
> Date: Fri, 26 Apr 2019 13:11:38 +0200
> 
> > And another set for -next, not that big this time.
> > See below for a summary of the highlights.
> > 
> > Please pull and let me know if there's any problem.
> 
> Pulled, thanks Johannes.
> 
> There was a minor confict in the TX code, two variables being added
> from different commits.

Oops, yeah, I knew about this but forgot to mention it, sorry about
that.

> Please double check my conflict resolution.

Looks fine, the order of the variables doesn't really matter and we do
need them both now :-)

johannes