| commit | 1726aa70e7e2f8967d60b4f836723b61f97db73e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 03 13:44:29 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Feb 03 13:44:29 2018 -0800 |
| tree | 0f516117fb85498cc89c08142f98305bcec25cae | |
| parent | c80c238a28b8a3b2f35898e9a49d9516f7d54346 [diff] | |
| parent | e2598077dc6a26c9644393e5c21f22a90dbdccdb [diff] |
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