From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Sep 2017 18:40:41 +0000 (-0700)
Subject: Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: MMI-PSA29.97-13-9~4651
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a30282478271ea8e06d424f96c1537094b309c7c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next-general' of git://git./linux/kernel/git/jmorris/linux-security

Pull misc security layer update from James Morris:
 "This is the remaining 'general' change in the security tree for v4.14,
  following the direct merging of SELinux (+ TOMOYO), AppArmor, and
  seccomp.

  That's everything now for the security tree except IMA, which will
  follow shortly (I've been traveling for the past week with patchy
  internet)"

* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: fix description of values returned by cap_inode_need_killpriv
---

a30282478271ea8e06d424f96c1537094b309c7c