From: Linus Torvalds Date: Wed, 11 Nov 2015 17:23:07 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v4.4-rc1~36 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/65d57b3050eed3d848e51761904668b5d156743c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This fixes a bug in the algif_hash interface that may lead to crashes when used with certain algorithms such as HMAC" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_hash - Only export and import on sockets with data --- 65d57b3050eed3d848e51761904668b5d156743c