projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c80c238 e259807)
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)
commit1726aa70e7e2f8967d60b4f836723b61f97db73e
tree0f516117fb85498cc89c08142f98305bcec25caetree | snapshot
parentc80c238a28b8a3b2f35898e9a49d9516f7d54346commit | diff
parente2598077dc6a26c9644393e5c21f22a90dbdccdbcommit | diff
Merge branch 'fixes-v4.16-rc1' of git://git./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 6.x block layer and io_uring tree(s)