Linus Torvalds 88265322c1 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "Highlights: - Integrity: add local fs integrity verification to detect offline attacks - Integrity: add digital signature verification - Simple stacking of Yama with other LSMs (per LSS discussions) - IBM vTPM support on ppc64 - Add new driver for Infineon I2C TIS TPM - Smack: add rule revocation for subject labels" Fixed conflicts with the user namespace support in kernel/auditsc.c and security/integrity/ima/ima_policy.c. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits) Documentation: Update git repository URL for Smack userland tools ima: change flags container data type Smack: setprocattr memory leak fix Smack: implement revoking all rules for a subject label Smack: remove task_wait() hook. ima: audit log hashes ima: generic IMA action flag handling ima: rename ima_must_appraise_or_measure audit: export audit_log_task_info tpm: fix tpm_acpi sparse warning on different address spaces samples/seccomp: fix 31 bit build on s390 ima: digital signature verification support ima: add support for different security.ima data types ima: add ima_inode_setxattr/removexattr function and calls ima: add inode_post_setattr call ima: replace iint spinblock with rwlock/read_lock ima: allocating iint improvements ima: add appraise action keywords and default rules ima: integrity appraisal extension vfs: move ima_file_free before releasing the file ...		2012-10-02 21:38:48 -07:00
..
evm_crypto.c	userns: Convert EVM to deal with kuids and kgids in it's hmac computation	2012-09-21 03:13:24 -07:00
evm_main.c	ima: integrity appraisal extension	2012-09-07 14:57:44 -04:00
evm_posix_acl.c	evm: posix acls modify i_mode	2011-09-14 15:24:51 -04:00
evm_secfs.c	evm: re-release	2011-07-18 12:29:40 -04:00
evm.h	evm: digital signature verification support	2011-11-09 16:51:14 +02:00
Kconfig	evm: remove TCG_TPM dependency	2011-09-14 15:24:49 -04:00
Makefile	evm: posix acls modify i_mode	2011-09-14 15:24:51 -04:00