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
This commit is contained in:
Linus Torvalds 2018-02-03 13:44:29 -08:00
commit 1726aa70e7
2 changed files with 2 additions and 0 deletions

View file

@ -7795,6 +7795,7 @@ F: include/keys/encrypted-type.h
F: security/keys/encrypted-keys/
KEYS-TRUSTED
M: James Bottomley <[email protected]>
M: Mimi Zohar <[email protected]>
L: [email protected]
L: [email protected]