Merge branch 'fixes-v5.1-a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Mar 2019 16:19:09 +0000 (09:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Mar 2019 16:19:09 +0000 (09:19 -0700)
commit12195302ee6c32cf3c0fa947e17303ce583d41c9
tree9060c84ebf1bc12280182bd7ddb0650316daf07e
parent922c010cf236357dea020f483c18373d6a494ffb
parent2623c4fbe2ad1341ff2d1e12410d0afdae2490ca
Merge branch 'fixes-v5.1-a' of git://git./linux/kernel/git/jmorris/linux-security

Pull security layer fixes from James Morris:
 "Yama and LSM config fixes"

* 'fixes-v5.1-a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  LSM: Revive CONFIG_DEFAULT_SECURITY_* for "make oldconfig"
  Yama: mark local symbols as static