From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2018 20:29:51 +0000 (-0700)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: ceph-for-4.20-rc2~121
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e80bc229691a4f601a2476e07cbdf08a289a2ad6;p=ceph-client.git

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'
---

e80bc229691a4f601a2476e07cbdf08a289a2ad6