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
| ||
|
Date: Fri, 16 Jan 2015 08:36:18 +0100 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 2015-01-15 On Thu, 2015-01-15 at 19:28 -0500, David Miller wrote: > I had to resolve a minor merge conflict, please take a look to make sure > I got it right. Ah, yes, sorry about that - I knew about the conflict (had resolved it numerous times) but forgot to give you a heads-up. What you did is good, thanks. johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists