]> 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)
commitf4c378a881597b3616fd1609e09952d7c105a95e
treecb00f0bf7888470004fa18bfcff803da31a2a01e
parent41097681c17307c3974091b51978f6df61c28d5f
parent12566c25539ded3680b665dfc99d498f35762dfb
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