netdev - Re: pull-request: wireless-drivers-next 2016-07-13

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]

Date:	Fri, 15 Jul 2016 10:22:28 +0300
From:	Kalle Valo <kvalo@...eaurora.org>
To:	David Miller <davem@...emloft.net>
Cc:	linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2016-07-13

David Miller <davem@...emloft.net> writes:

> From: Kalle Valo <kvalo@...eaurora.org>
> Date: Wed, 13 Jul 2016 21:29:13 +0300
>
>> here's a pull request for net-next. This time there are few conflicts
>> due to the cfg80211 scan API changes, and one of them is easy to miss,
>> so please pay extra attention to them. Otherwise there's not nothing
>> really out of ordinary. Please note that I also pulled wireless-drivers
>> to wireless-drivers-next to reduce the amount of conflicts.
>> 
>> So about the conflicts, the obvious are notified by git:
>  ...
>> I have attached the output from git diff as an example how to resolve
>> this, hopefully that helps. Please let me know if there are any problems
>> or if you want to handle these differently.
>
> Thanks for all of the conflict resolution info, it really helped.
>
> I pushed this all out, please double check my work.

Looks good, thanks!

-- 
Kalle Valo