]> 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)
commit29d1ac94171e5aebb69ccbfa1d816efc0c9e18dc
treedb0923d0693e15f942c05c7d8ffbeda83ad362a4
parentaf5d6e56effd9b60766580059fd75d274ea63509
parent0d869356f9a2f241b2cc60bc6e06940c0016e794
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