From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Dec 2018 20:04:52 +0000 (-0800)
Subject: Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3f03bf93947fa2a2b84fac56e93c65d4fffed7f1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'next-general' of git://git./linux/kernel/git/jmorris/linux-security

Pull general security subsystem updates from James Morris:
 "The main changes here are Paul Gortmaker's removal of unneccesary
  module.h infrastructure"

* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: integrity: partial revert of make ima_main explicitly non-modular
  security: fs: make inode explicitly non-modular
  security: audit and remove any unnecessary uses of module.h
  security: integrity: make evm_main explicitly non-modular
  keys: remove needless modular infrastructure from ecryptfs_format
  security: integrity: make ima_main explicitly non-modular
  tomoyo: fix small typo
---

3f03bf93947fa2a2b84fac56e93c65d4fffed7f1