diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:40:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 11:40:41 -0700 |
| commit | a30282478271ea8e06d424f96c1537094b309c7c (patch) | |
| tree | 2ca55dabb02982b05cc4a80df09ea285114fb071 /include | |
| parent | 1436ab068d6b0309a73849dc239399399621decd (diff) | |
| parent | ab5348c9c23cd253f5902980d2d8fe067dc24c82 (diff) | |
| download | linux-a30282478271ea8e06d424f96c1537094b309c7c.tar.bz2 | |
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 'include')
0 files changed, 0 insertions, 0 deletions