From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jul 2019 19:24:21 +0000 (-0700)
Subject: Merge branch 'next-lsm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9d22167f34305280c5dd57a74c21651da3c23015;p=linux.git

Merge branch 'next-lsm' of git://git./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
---

9d22167f34305280c5dd57a74c21651da3c23015