netdev - Re: pull-request: wireless-drivers-next-2020-08-04

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: <20200804.125806.1796616541997080836.davem@davemloft.net>
Date:   Tue, 04 Aug 2020 12:58:06 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     kvalo@...eaurora.org
Cc:     netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next-2020-08-04

From: Kalle Valo <kvalo@...eaurora.org>
Date: Tue,  4 Aug 2020 11:14:33 +0000 (UTC)

> wireless-drivers-next patches for v5.9
> 
> Second set of patches for v5.9. mt76 has most of patches this time.
> Otherwise it's just smaller fixes and cleanups to other drivers.
> 
> There was a major conflict in mt76 driver between wireless-drivers and
> wireless-drivers-next. I solved that by merging the former to the
> latter.
 ...

Pulled, thanks Kalle.

I don't know how I missed the conflict resolution guide in your previous
pull request.  I was sure I scanned it for such info several times :-/

Thanks again!