diff options
| author | Linus Torvalds <[email protected]> | 2017-09-24 18:40:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-09-24 18:40:41 +0000 |
| commit | a30282478271ea8e06d424f96c1537094b309c7c (patch) | |
| tree | 2ca55dabb02982b05cc4a80df09ea285114fb071 /fs/proc/array.c | |
| parent | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor... (diff) | |
| parent | security: fix description of values returned by cap_inode_need_killpriv (diff) | |
| download | kernel-a30282478271ea8e06d424f96c1537094b309c7c.tar.gz kernel-a30282478271ea8e06d424f96c1537094b309c7c.zip | |
Merge branch 'next-general' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions