]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Feb 2018 21:44:29 +0000 (13:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Feb 2018 21:44:29 +0000 (13:44 -0800)
commit9db1e71737e2222abae7a0f000625ed44ca5f9c3
tree0f516117fb85498cc89c08142f98305bcec25cae
parentc0c8129a6ec11206f4d9305fc4f66b94780b58c6
parente473fb5c649a8d9e5484b356d7c5ab851332671d
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
MAINTAINERS