linux-kernel - Re: pull-request: wireless-drivers-next 2019-04-18

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190418.111444.1325343486196462539.davem@davemloft.net>
Date:   Thu, 18 Apr 2019 11:14:44 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     kvalo@...eaurora.org
Cc:     linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2019-04-18

From: Kalle Valo <kvalo@...eaurora.org>
Date: Thu, 18 Apr 2019 16:48:20 +0300

> here's a pull request to net-next for v5.2, more info below. But do note
> that this time we have two trivial conflicts in iwlwifi, here are
> Stephen's example resolutions:
> 
> https://lkml.kernel.org/r/20190415120133.40c0f343@canb.auug.org.au
> 
> https://lkml.kernel.org/r/20190415120853.39e0e46a@canb.auug.org.au
> 
> The only change to Stephen's resolution I recommend is to have in drv.c
> an empty line between group 0x2723 and group 0x1a56, but that's just
> cosmetic anyway so it doesn't matter really in the end.
> 
> As always, please do let me know if there any problems.

Pulled, please double check my work.