Linus Torvalds 3f03bf9394 Merge branch 'next-general' of git://git.kernel.org/pub/scm/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

2018-12-27 12:04:52 -08:00

..

encrypted-keys

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

big_key.c

big key: get rid of stack array allocation

2018-05-11 13:07:45 -07:00

compat_dh.c

KEYS: DH: validate __spare field

2017-07-14 11:01:38 +10:00

compat.c

KEYS: Provide keyctls to drive the new key type ops for asymmetric keys [ver #2]

2018-10-26 09:30:46 +01:00

dh.c

Revert "uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name"

2018-09-25 13:28:58 +02:00

gc.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

internal.h

KEYS: Provide keyctls to drive the new key type ops for asymmetric keys [ver #2]

2018-10-26 09:30:46 +01:00

Kconfig

security/keys: BIG_KEY requires CONFIG_CRYPTO

2017-10-18 09:12:40 +01:00

key.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

keyctl_pkey.c

security: don't use a negative Opt_err token index

2018-12-17 16:21:48 -08:00

keyctl.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

keyring.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

Makefile

KEYS: Provide keyctls to drive the new key type ops for asymmetric keys [ver #2]

2018-10-26 09:30:46 +01:00

permission.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

persistent.c

sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>

2017-03-02 08:42:31 +01:00

proc.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

process_keys.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

request_key_auth.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

request_key.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00

sysctl.c

security: Convert use of typedef ctl_table to struct ctl_table

2014-04-15 13:39:58 +10:00

trusted.c

security: don't use a negative Opt_err token index

2018-12-17 16:21:48 -08:00

user_defined.c

security: audit and remove any unnecessary uses of module.h

2018-12-12 14:58:51 -08:00