summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'selinux-pr-20180130' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-01-313-14/+13
|\
| * selinux: skip bounded transition processing if the policy isn't loadedPaul Moore2017-12-051-0/+3
| * selinux: ensure the context is NUL terminated in security_context_to_sid_core()Paul Moore2017-11-291-10/+8
| * security: replace FSF address with web source in license noticesMartin Kepplinger2017-11-202-4/+2
* | Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-01-314-30/+94
|\ \
| * \ Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/k...James Morris2017-11-294-30/+94
| |\ \
| | * | ptrace, seccomp: add support for retrieving seccomp metadataTycho Andersen2017-11-294-0/+51
| | * | seccomp: hoist out filter resolving logicTycho Andersen2017-11-291-32/+45
| * | | Merge tag 'v4.15-rc1' into next-seccompJames Morris2017-11-2929972-661076/+1241683
| |\| |
* | | | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2018-01-3133-443/+789
|\ \ \ \
| * \ \ \ Merge tag 'tpmdd-next-20180108' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-01-0933-443/+789
| |\ \ \ \
| | * | | | tpm: remove unused variablesArnd Bergmann2018-01-081-2/+0
| | * | | | tpm: remove unused data fields from I2C and OF device ID tablesJavier Martinez Canillas2018-01-081-21/+6
| | * | | | tpm: only attempt to disable the LPC CLKRUN if is already enabledJavier Martinez Canillas2018-01-081-1/+10
| | * | | | tpm: follow coding style for variable declaration in tpm_tis_core_init()Javier Martinez Canillas2018-01-081-1/+3
| | * | | | tpm: delete the TPM_TIS_CLK_ENABLE flagJavier Martinez Canillas2018-01-083-18/+0
| | * | | | tpm: Update MAINTAINERS for Jason GunthorpeJason Gunthorpe2018-01-081-1/+2
| | * | | | tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()Azhar Shaikh2018-01-085-92/+119
| | * | | | tpm_tis: Move ilb_base_addr to tpm_tis_dataAzhar Shaikh2018-01-083-48/+56
| | * | | | tpm2-cmd: allow more attempts for selftest executionAlexander.Steffen@infineon.com2018-01-081-7/+5
| | * | | | tpm: return a TPM_RC_COMMAND_CODE response if command is not implementedJavier Martinez Canillas2018-01-082-8/+25
| | * | | | tpm: Move Linux RNG connection to hwrngJason Gunthorpe2018-01-086-69/+52
| | * | | | tpm: use struct tpm_chip for tpm_chip_find_get()Jarkko Sakkinen2018-01-089-116/+126
| | * | | | tpm: parse TPM event logs based on EFI tableThiebaud Weksteen2018-01-086-4/+88
| | * | | | efi: call get_event_log before ExitBootServicesThiebaud Weksteen2018-01-087-3/+174
| | * | | | tpm: add event log format versionThiebaud Weksteen2018-01-081-0/+3
| | * | | | tpm: rename event log provider filesThiebaud Weksteen2018-01-083-2/+2
| | * | | | tpm: move tpm_eventlog.h outside of drivers folderThiebaud Weksteen2018-01-088-34/+37
| | * | | | tpm: use tpm_msleep() value as max delayNayna Jain2018-01-081-2/+2
| | * | | | tpm: reduce tpm polling delay in tpm_tis_coreNayna Jain2018-01-081-2/+8
| | * | | | tpm: move wait_for_tpm_stat() to respective driver filesNayna Jain2017-12-164-62/+121
| |/ / / /
* | | | | Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2018-01-313-12/+39
|\ \ \ \ \
| * | | | | Smack: Privilege check on key operationsCasey Schaufler2018-01-103-11/+34
| * | | | | Smack: fix dereferenced before checkVasyl Gomonovych2017-12-271-1/+5
| |/ / / /
* | | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-01-3114-125/+332
|\ \ \ \ \
| * | | | | ima/policy: fix parsing of fsuuidMike Rapoport2018-01-181-1/+1
| * | | | | ima: Use i_version only when filesystem supports itSascha Hauer2017-12-181-1/+2
| * | | | | integrity: remove unneeded initializations in integrity_iint_cache entriesJeff Layton2017-12-181-4/+0
| * | | | | ima: log message to module appraisal errorBruno E. O. Meneguele2017-12-181-1/+3
| * | | | | ima: pass filename to ima_rdwr_violation_check()Roberto Sassu2017-12-181-3/+3
| * | | | | ima: Fix line continuation formatJoe Perches2017-12-181-6/+5
| * | | | | ima: support new "hash" and "dont_hash" policy actionsMimi Zohar2017-12-186-21/+65
| * | | | | ima: re-introduce own integrity cache lockDmitry Kasatkin2017-12-114-40/+77
| * | | | | EVM: Add support for portable signature formatMatthew Garrett2017-12-116-21/+92
| * | | | | EVM: Allow userland to permit modification of EVM-protected metadataMatthew Garrett2017-12-114-31/+88
| * | | | | ima: relax requiring a file signature for new files with zero lengthMimi Zohar2017-12-111-1/+2
| |/ / / /
| * | | | Sync to v4.15-rc3 for security subsystem developers to work against.James Morris2017-12-1124122-287875/+621063
| |\ \ \ \
* | \ \ \ \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2018-01-3113-187/+227
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'for-4.16/remove-immediate' into for-linusJiri Kosina2018-01-318-181/+33
| |\ \ \ \ \ \
| | * | | | | | livepatch: Remove immediate featureMiroslav Benes2018-01-118-181/+33