| commit | d8fc9cde85d829eed6ca050d86799cc4cfa6a048 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 08 21:35:29 2020 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 08 21:35:29 2020 -0700 |
| tree | 1e8986eb065387f51a1312ab4f013d3d4f0ebdca | |
| parent | 5602b0af9df02783df0e8fd9afc5dcadd38a3271 [diff] | |
| parent | 755bddd1e4eaf9178758bd554c60aaab46fc42ba [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "This fixes a Kconfig dependency for hisilicon as well as a double free in marvell/octeontx" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: marvell/octeontx - fix double free of ptr crypto: hisilicon - Fix build error