Linus Torvalds 8cc748aa76 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security layer updates from James Morris: "Highlights: - Smack adds secmark support for Netfilter - /proc/keys is now mandatory if CONFIG_KEYS=y - TPM gets its own device class - Added TPM 2.0 support - Smack file hook rework (all Smack users should review this!)" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (64 commits) cipso: don't use IPCB() to locate the CIPSO IP option SELinux: fix error code in policydb_init() selinux: add security in-core xattr support for pstore and debugfs selinux: quiet the filesystem labeling behavior message selinux: Remove unused function avc_sidcmp() ima: /proc/keys is now mandatory Smack: Repair netfilter dependency X.509: silence asn1 compiler debug output X.509: shut up about included cert for silent build KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y MAINTAINERS: email update tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device smack: fix possible use after frees in task_security() callers smack: Add missing logging in bidirectional UDS connect check Smack: secmark support for netfilter Smack: Rework file hooks tpm: fix format string error in tpm-chip.c char/tpm/tpm_crb: fix build error smack: Fix a bidirectional UDS connect check typo smack: introduce a special case for tmpfs in smack_d_instantiate() ...		2015-02-11 20:25:11 -08:00
..
apparmor	module: rename KERNEL_PARAM_FL_NOARG to avoid confusion	2014-08-27 21:54:07 +09:30
integrity	ima: /proc/keys is now mandatory	2015-02-02 13:19:48 +11:00
keys	KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y	2015-01-22 22:34:32 +00:00
selinux	SELinux: fix error code in policydb_init()	2015-02-04 11:34:30 -05:00
smack	Smack: Repair netfilter dependency	2015-01-23 10:08:19 -08:00
tomoyo	rcu: Make SRCU optional by using CONFIG_SRCU	2015-01-06 11:04:29 -08:00
yama
capability.c	security: make security_file_set_fowner, f_setown and __f_setown void return	2014-09-09 16:01:36 -04:00
commoncap.c	kill f_dentry uses	2014-11-19 13:01:25 -05:00
device_cgroup.c	cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes	2014-07-15 11:05:09 -04:00
inode.c	Documentation: Docbook: Fix generated DocBook/kernel-api.xml	2014-09-09 10:34:56 +02:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64	2014-02-05 14:59:14 +00:00
lsm_audit.c	audit: anchor all pid references in the initial pid namespace	2014-03-20 10:11:55 -04:00
Makefile	security: cleanup Makefiles to use standard syntax for specifying sub-directories	2014-02-17 11:08:04 +11:00
min_addr.c
security.c	security: make security_file_set_fowner, f_setown and __f_setown void return	2014-09-09 16:01:36 -04:00