diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:29:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 13:29:51 -0700 |
commit | e80bc229691a4f601a2476e07cbdf08a289a2ad6 (patch) | |
tree | cb00f0bf7888470004fa18bfcff803da31a2a01e /drivers/net/ppp | |
parent | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
parent | Merge branch 'smack-for-4.20' of https://github.com/cschaufler/next-smack into next-smack (diff) | |
download | linux-dev-e80bc229691a4f601a2476e07cbdf08a289a2ad6.tar.xz linux-dev-e80bc229691a4f601a2476e07cbdf08a289a2ad6.zip |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack updates from James Morris:
"From Casey: three patches for Smack for 4.20. Two clean up warnings
and one is a rarely encountered ptrace capability check"
* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Smack: Mark expected switch fall-through
Smack: ptrace capability use fixes
Smack: remove set but not used variable 'root_inode'
Diffstat (limited to 'drivers/net/ppp')
0 files changed, 0 insertions, 0 deletions