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, 19 Feb 2016 10:49:57 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Herbert Xu <herbert@...dor.apana.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Insu Yun <wuninsu@...il.com> Subject: linux-next: manual merge of the crypto tree with the net tree Hi Herbert, Today's linux-next merge of the crypto tree got a conflict in: net/ipv4/tcp.c between commit: 1eea84b74cd2 ("tcp: correctly crypto_alloc_hash return check") from the net tree and commit: cf80e0e47e0e ("tcp: Use ahash") from the crypto tree. I fixed it up (the latter removed the code fixed by the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists