From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Jan 2019 18:56:09 +0000 (-0800)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.4-rc1~1892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19f2e267a5d0d26282a64f8f788c482852c95324;p=platform%2Fkernel%2Flinux-rpi.git

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

19f2e267a5d0d26282a64f8f788c482852c95324