summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-11-0689-492/+1748
|\
| * Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2015-10-2353-239/+572
| |\
| | * KEYS: Merge the type-specific data with the payload dataDavid Howells2015-10-2149-230/+286
| | * KEYS: Provide a script to extract a module signatureDavid Howells2015-10-211-0/+136
| | * KEYS: Provide a script to extract the sys cert list from a vmlinux fileDavid Howells2015-10-211-0/+144
| | * keys: Be more consistent in selection of union members usedInsu Yun2015-10-211-1/+1
| | * certs: add .gitignore to stop git nagging about x509_certificate_listPaul Gortmaker2015-10-212-1/+4
| | * KEYS: use kvfree() in add_keyGeliang Tang2015-10-211-7/+1Star
| * | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-10-225-45/+36Star
| |\ \
| | * | selinux: Use a kmem_cache for allocation struct file_security_structSangwoo2015-10-211-2/+6
| | * | selinux: ioctl_has_perm should be staticGeliang Tang2015-10-211-1/+1
| | * | selinux: use sprintf return valueRasmus Villemoes2015-10-211-4/+1Star
| | * | selinux: use kstrdup() in security_get_bools()Rasmus Villemoes2015-10-211-7/+1Star
| | * | selinux: use kmemdup in security_sid_to_context_core()Rasmus Villemoes2015-10-211-2/+2
| | * | selinux: remove pointless cast in selinux_inode_setsecurity()Rasmus Villemoes2015-10-211-1/+1
| | * | selinux: introduce security_context_str_to_sidRasmus Villemoes2015-10-214-25/+20Star
| | * | selinux: do not check open perm on ftruncate callJeff Vander Stoep2015-10-211-1/+2
| | * | selinux: change CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE defaultPaul Moore2015-10-211-2/+2
| | |/
| * / apparmor: clarify CRYPTO dependencyArnd Bergmann2015-10-221-1/+1
| |/
| * Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into...James Morris2015-10-215-47/+248
| |\
| | * Smack: limited capability for changing process labelZbigniew Jasinski2015-10-195-41/+239
| | * Smack: pipefs fix in smack_d_instantiateRoman Kubiak2015-10-101-0/+3
| | * Smack: Minor initialisation improvementJosé Bollo2015-10-102-3/+3
| | * smack: smk_ipv6_port_list should be staticGeliang Tang2015-10-101-1/+1
| | * Smack: fix a NULL dereference in wrong smack_import_entry() usageLukasz Pawelczyk2015-10-101-2/+2
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-10-201-1/+1
| |\ \
| | * | integrity: prevent loading untrusted certificates on the IMA trusted keyringDmitry Kasatkin2015-10-091-1/+1
| | |/
| * | TPM: remove unnecessary little endian conversionHon Ching \(Vicky\) Lo2015-10-191-2/+2
| * | vTPM: support little endian guestsHon Ching \(Vicky\) Lo2015-10-192-22/+62
| * | char: Drop owner assignment from i2c_driverKrzysztof Kozlowski2015-10-194-4/+0Star
| * | vTPM: get the buffer allocated for event log instead of the actual logHon Ching \(Vicky\) Lo2015-10-191-6/+15
| * | vTPM: reformat event log to be byte-alignedHon Ching \(Vicky\) Lo2015-10-191-1/+12
| * | vTPM: fix searching for the right vTPM node in device treeHon Ching \(Vicky\) Lo2015-10-192-5/+5
| * | MAINTAINERS: add new maintainer for TPM DEVICE DRIVERJarkko Sakkinen2015-10-191-0/+1
| * | keys, trusted: seal/unseal with TPM 2.0 chipsJarkko Sakkinen2015-10-191-3/+33
| * | tpm: seal/unseal for TPM 2.0Jarkko Sakkinen2015-10-195-3/+366
| * | keys, trusted: move struct trusted_key_options to trusted-type.hJarkko Sakkinen2015-10-192-11/+12
| * | tpm: introduce tpm_bufJarkko Sakkinen2015-10-191-0/+97
| * | tpm: update PPI documentation to address the location change.Jarkko Sakkinen2015-10-191-7/+12
| * | tpm: move the PPI attributes to character device directory.Jarkko Sakkinen2015-10-193-42/+33Star
| * | sysfs: added __compat_only_sysfs_link_entry_to_kobj()Jarkko Sakkinen2015-10-192-0/+55
| * | tpm, tpm_tis: fix tpm_tis ACPI detection issue with TPM 2.0Jarkko Sakkinen2015-10-193-50/+181
| * | tpm, tpm_crb: fix unaligned read of the command buffer addressJarkko Sakkinen2015-10-191-3/+4
| * | vTPM: fix memory allocation flag for rtce buffer at kernel bootHon Ching \(Vicky\) Lo2015-10-191-1/+1
| * | tpm: Allow compile test of GPIO consumers if !GPIOLIBGeert Uytterhoeven2015-10-191-1/+1
| |/
* | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2015-11-065-29/+43
|\ \
| * | audit: make audit_log_common_recv_msg() a void functionPaul Moore2015-11-041-5/+3Star
| * | audit: removing unused variableSaurabh Sengar2015-11-041-4/+3Star
| * | audit: fix comment block whitespaceScott Matheina2015-11-041-7/+7
| * | audit: audit_tree_match can be booleanYaowei Bai2015-11-042-4/+4