netdev - Re: pull-request: mac80211-next 2016-09-30

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: <20161003.200759.1639996239635020627.davem@davemloft.net>
Date:   Mon, 03 Oct 2016 20:07:59 -0400 (EDT)
From:   David Miller <davem@...emloft.net>
To:     johannes@...solutions.net
Cc:     netdev@...r.kernel.org, linux-wireless@...r.kernel.org
Subject: Re: pull-request: mac80211-next 2016-09-30

From: Johannes Berg <johannes@...solutions.net>
Date: Mon, 03 Oct 2016 12:07:00 +0200

> On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote:
>> 
>> Could you please look into this and send me a new pull request with
>> the conflicts resolved?
>> 
> 
> Sure, will do (tomorrow, we have a holiday today).
> 
> Would you prefer I send you the merge resolution for your tree, or just
> pull in net for a new pull request?

Resolve it using net-next since that is what I will pull it into.