From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Mar 2019 16:19:09 +0000 (-0700)
Subject: Merge branch 'fixes-v5.1-a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.15~6683
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=12195302ee6c32cf3c0fa947e17303ce583d41c9;p=mirror_ubuntu-kernels.git

Merge branch 'fixes-v5.1-a' of git://git.kernel.org/pub/scm/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
---

12195302ee6c32cf3c0fa947e17303ce583d41c9