| commit | 19f2e267a5d0d26282a64f8f788c482852c95324 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 02 10:56:09 2019 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 02 10:56:09 2019 -0800 |
| tree | db0923d0693e15f942c05c7d8ffbeda83ad362a4 | |
| parent | 1ac5cd4978794bd060d448acc0305e9fc996ba92 [diff] | |
| parent | 20bb4cb4fb9fb994d757932abc4404cf0f0f56cc [diff] |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/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