diff options
author | 2020-04-08 21:35:29 -0700 | |
---|---|---|
committer | 2020-04-08 21:35:29 -0700 | |
commit | d8fc9cde85d829eed6ca050d86799cc4cfa6a048 (patch) | |
tree | 1e8986eb065387f51a1312ab4f013d3d4f0ebdca /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'linux-watchdog-5.7-rc1' of git://www.linux-watchdog.org/linux-watchdog (diff) | |
parent | crypto: marvell/octeontx - fix double free of ptr (diff) | |
download | linux-dev-d8fc9cde85d829eed6ca050d86799cc4cfa6a048.tar.xz linux-dev-d8fc9cde85d829eed6ca050d86799cc4cfa6a048.zip |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions