]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2019 18:56:09 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Jan 2019 18:56:09 +0000 (10:56 -0800)
commit1755894f14e7e9a4e257560452668ba4ff2fe2e4
treedb0923d0693e15f942c05c7d8ffbeda83ad362a4
parent1e3c9868bf261a290f7be01b97754034dfe99d80
parent1c9269087f22338739b44879cf3fcb3dfa3e391e
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull smack updates from James Morris:
 "Two Smack patches for 4.21.

  Jose's patch adds missing documentation and Zoran's fleshes out the
  access checks on keyrings"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Improve Documentation
  smack: fix access permissions for keyring