Hi Linus,
Please pull these general updates for the security subsystem for v4.21.
The main changes here are Paul Gortmaker's removal of unneccesary module.h
infrastructure.
The following changes since commit 7566ec393f4161572ba6f11ad5171fd5d59b0fbd:
Linux 4.20-rc7 (2018-12-16 15:46:55 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
next-general
for you to fetch changes up to b49d564344f773d8afee982153c8493e5f2eaf38:
security: integrity: partial revert of make ima_main explicitly non-modular
(2018-12-20 09:59:12 -0800)
----------------------------------------------------------------
James Morris (2):
Merge tag 'v4.20-rc2' into next-general
Merge tag 'v4.20-rc7' into next-general
Paul Gortmaker (6):
security: integrity: make ima_main explicitly non-modular
keys: remove needless modular infrastructure from ecryptfs_format
security: integrity: make evm_main explicitly non-modular
security: audit and remove any unnecessary uses of module.h
security: fs: make inode explicitly non-modular
security: integrity: partial revert of make ima_main explicitly
non-modular
Yangtao Li (1):
tomoyo: fix small typo
security/apparmor/apparmorfs.c | 2 +-
security/commoncap.c | 1 -
security/inode.c | 6 ++----
security/integrity/evm/evm_crypto.c | 2 +-
security/integrity/evm/evm_main.c | 5 +----
security/integrity/evm/evm_posix_acl.c | 1 -
security/integrity/evm/evm_secfs.c | 2 +-
security/integrity/iint.c | 2 +-
security/integrity/ima/ima_api.c | 1 -
security/integrity/ima/ima_appraise.c | 2 +-
security/integrity/ima/ima_fs.c | 2 +-
security/integrity/ima/ima_init.c | 2 +-
security/integrity/ima/ima_main.c | 5 ++---
security/integrity/ima/ima_policy.c | 2 +-
security/integrity/ima/ima_queue.c | 1 -
security/keys/encrypted-keys/ecryptfs_format.c | 5 ++---
security/keys/encrypted-keys/masterkey_trusted.c | 1 -
security/keys/gc.c | 1 -
security/keys/key.c | 2 +-
security/keys/keyctl.c | 1 -
security/keys/keyring.c | 2 +-
security/keys/permission.c | 2 +-
security/keys/proc.c | 1 -
security/keys/process_keys.c | 1 -
security/keys/request_key.c | 2 +-
security/keys/request_key_auth.c | 1 -
security/keys/user_defined.c | 2 +-
security/security.c | 2 +-
security/tomoyo/util.c | 2 +-
29 files changed, 22 insertions(+), 39 deletions(-)
