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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 17 May 2016 14:11:54 -0400 (EDT) From: David Miller <davem@...emloft.net> To: bjorn.andersson@...aro.org Cc: arnd@...db.de, linux-arm-kernel@...ts.infradead.org, sfr@...b.auug.org.au, andy.gross@...aro.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org, linux-next@...r.kernel.org, olof@...om.net Subject: Re: QRTR merge conflict resolution From: Bjorn Andersson <bjorn.andersson@...aro.org> Date: Fri, 13 May 2016 15:19:09 -0700 > I have prepared the merge of net-next and the conflicting tag from the > Qualcomm SOC, please include this in your pull towards Linus to avoid > the merge conflict. Pulled, thanks.
Powered by blists - more mailing lists