]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf5fe47 34467f8)
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)
commit6fbb9bd2ecd73cfbd5a78c56194c773b3ce8d9a8
tree0f516117fb85498cc89c08142f98305bcec25caetree | snapshot
parentbf5fe474e3cb0341ac876754cd045b2d14d482d9commit | diff
parent34467f85d50d7425193b8d9413c270e1fac86170commit | 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
MAINTAINERS diff1 | diff2 | blob | history
Linux Kernel Source Tree.