From: Linus Torvalds Date: Fri, 23 Feb 2018 00:38:10 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0bb78166dfda3d4ff07dd4bd04caa6244a867927;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "Fix an oops in the s5p-sss driver when used with ecb(aes)" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: s5p-sss - Fix kernel Oops in AES-ECB mode --- 0bb78166dfda3d4ff07dd4bd04caa6244a867927