diff options
author | 2018-02-03 13:44:29 -0800 | |
---|---|---|
committer | 2018-02-03 13:44:29 -0800 | |
commit | 1726aa70e7e2f8967d60b4f836723b61f97db73e (patch) | |
tree | 0f516117fb85498cc89c08142f98305bcec25cae /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | ima: re-initialize iint->atomic_flags (diff) | |
download | linux-dev-1726aa70e7e2f8967d60b4f836723b61f97db73e.tar.xz linux-dev-1726aa70e7e2f8967d60b4f836723b61f97db73e.zip |
Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity fixes from James Morris:
- add James Bottommley as a Trusted Keys maintainer.
- IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi.
* 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: re-initialize iint->atomic_flags
maintainers: update trusted keys
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions