]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Oct 2018 20:29:51 +0000 (13:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Oct 2018 20:29:51 +0000 (13:29 -0700)
commit5d49ad9769ee6795bb6700e93c88d11ce535e1f0
treecb00f0bf7888470004fa18bfcff803da31a2a01e
parent4153fe8b546f6399bb372438a6a4069a98d37766
parentb31e5853391700857d133fac9a14121c72850067
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'
security/smack/smack_lsm.c