summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-06-2742-4089/+3741
|\
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-06-186-25/+112
| |\
| | * ima: update builtin policiesMimi Zohar2015-06-162-10/+65
| | * ima: extend "mask" policy matching supportMimi Zohar2015-06-162-6/+17
| | * ima: add support for new "euid" policy conditionMimi Zohar2015-06-162-5/+25
| | * ima: fix ima_show_template_data_ascii()Mimi Zohar2015-06-163-4/+5
| * | tpm, tpm_crb: fix le64_to_cpu conversions in crb_acpi_add()Jarkko Sakkinen2015-06-161-2/+2
| * | vTPM: set virtual device before passing to ibmvtpm_reset_crqHon Ching \(Vicky\) Lo2015-06-161-2/+3
| * | tpm_ibmvtpm: remove unneccessary message level.Fabian Frederick2015-06-161-1/+1
| |/
| * Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-n...James Morris2015-06-131-7/+9
| |\
| | * Smack: freeing an error pointer in smk_write_revoke_subj()Dan Carpenter2015-06-121-7/+9
| * | selinux: fix setting of security labels on NFSJ. Bruce Fields2015-06-051-0/+1
| * | selinux: Remove unused permission definitionsStephen Smalley2015-06-041-14/+8
| * | selinux: enable genfscon labeling for sysfs and pstore filesStephen Smalley2015-06-041-1/+3
| * | selinux: enable per-file labeling for debugfs files.Stephen Smalley2015-06-042-22/+22
| * | selinux: update netlink socket classesStephen Smalley2015-06-042-10/+32
| * | signals: don't abuse __flush_signals() in selinux_bprm_committed_creds()Oleg Nesterov2015-06-043-12/+8
| * | selinux: Print 'sclass' as string when unrecognized netlink message occursMarek Milkovic2015-06-041-2/+3
| * | Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-n...James Morris2015-06-035-189/+317
| |\|
| | * Smack: allow multiple labels in onlycapRafal Krypa2015-06-024-72/+163
| | * Smack: fix seq operations in smackfsRafal Krypa2015-06-021-30/+22
| | * smack: pass error code through pointersLukasz Pawelczyk2015-05-153-97/+139
| | * Smack: ignore private inode for smack_file_receiveSeung-Woo Kim2015-05-151-0/+3
| * | ima: pass iint to ima_add_violation()Roberto Sassu2015-05-215-9/+13
| * | ima: wrap event related data to the new ima_event_data structureRoberto Sassu2015-05-215-79/+61
| * | integrity: add validity checks for 'path' parameterDmitry Kasatkin2015-05-213-2/+5
| * | KEYS: fix "ca_keys=" partial key matchingMimi Zohar2015-05-213-11/+35
| * | evm: fix potential race when removing xattrsDmitry Kasatkin2015-05-212-9/+8
| * | evm: labeling pseudo filesystems exceptionMimi Zohar2015-05-211-0/+11
| * | ima: remove definition of IMA_X509_PATHDmitry Kasatkin2015-05-211-7/+1
| * | ima: limit file hash setting by user to fix and log modesDmitry Kasatkin2015-05-211-2/+6
| * | ima: do not measure or appraise the NSFS filesystemMimi Zohar2015-05-212-0/+5
| * | ima: skip measurement of cgroupfs files and update documentationRoberto Sassu2015-05-212-5/+14
| * | ima: added ima-sig template among choices in kernel-parameters.txtRoberto Sassu2015-05-131-1/+1
| * | ima: cleanup ima_init_policy() a littleDan Carpenter2015-05-131-10/+6
| |/
| * LSM: Remove unused capability.cCasey Schaufler2015-05-121-1158/+0
| * LSM: Switch to lists of hooksCasey Schaufler2015-05-1213-387/+627
| * LSM: Add security module hook list headsCasey Schaufler2015-05-126-402/+626
| * LSM: Introduce security hook calling MacrosCasey Schaufler2015-05-121-207/+226
| * LSM: Remove a comment from security.hCasey Schaufler2015-05-121-1270/+0
| * LSM: Add the comment to lsm_hooks.hCasey Schaufler2015-05-121-0/+1279
| * LSM: Split security.hCasey Schaufler2015-05-129-312/+365
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2015-06-27281-2321/+6271
|\ \
| * | MIPS: spinlock: Adjust arch_spin_lock back-off timeMarkos Chandras2015-06-241-1/+1
| * | MIPS: asmmacro: Ensure 64-bit FP registers are used with MSAMarkos Chandras2015-06-241-0/+11
| * | MIPS: BCM47xx: Simplify handling SPROM revisionsRafał Miłecki2015-06-211-44/+9
| * | MIPS: Cobalt Don't use module_init in non-modular MTD registration.Paul Gortmaker2015-06-211-2/+1
| * | MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/Rafał Miłecki2015-06-219-2/+25
| * | MIPS: use for_each_sg()Akinobu Mita2015-06-211-10/+20
| * | MIPS: BCM47xx: Don't select BCMA_HOST_PCIRafał Miłecki2015-06-211-1/+0
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 15:32:45 +0100