]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 19:24:21 +0000 (12:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jul 2019 19:24:21 +0000 (12:24 -0700)
commit9d22167f34305280c5dd57a74c21651da3c23015
tree2cafd45c1ea48fc922c178260b508d68a6e909d8
parent593c75463ab6d6985cdc9916f3d1c28b5f6340cd
parentc5eaab1d131d0a6272df7d55a971a67400d63f56
Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull capabilities update from James Morris:
 "Minor fixes for capabilities:

   - Update the commoncap.c code to utilize XATTR_SECURITY_PREFIX_LEN,
     from Carmeli tamir.

   - Make the capability hooks static, from Yue Haibing"

* 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security/commoncap: Use xattr security prefix len
  security: Make capability_hooks static
security/commoncap.c