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 /arch/m68k | |
parent | 52ff0779d6cfcce24c0204c22b0b4899dc55449d (diff) | |
parent | f0f9756b7260f4e78a2e4e412a55167178721ca2 (diff) |
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 'arch/m68k')
0 files changed, 0 insertions, 0 deletions