From: Linus Torvalds Date: Fri, 30 Dec 2016 17:29:50 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v5.15~12149 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f3de082c12e5e9ff43c58a7561f6ec3272d03a48;p=mirror_ubuntu-kernels.git 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 boot failure on some platforms when crypto self test is enabled along with the new acomp interface" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: testmgr - Use heap buffer for acomp test input --- f3de082c12e5e9ff43c58a7561f6ec3272d03a48