summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-04-0822-70/+227
|\
| * ima: Fallback to the builtin hash algorithmPetr Vorel2018-03-252-0/+15
| * ima: Add smackfs to the default appraise/measure listMartin Townsend2018-03-251-0/+2
| * evm: check for remount ro in progress before writingSascha Hauer2018-03-251-2/+6
| * ima: Improvements in ima_appraise_measurement()Thiago Jung Bauermann2018-03-251-13/+22
| * ima: Simplify ima_eventsig_init()Thiago Jung Bauermann2018-03-251-8/+3Star
| * integrity: Remove unused macro IMA_ACTION_RULE_FLAGSThiago Jung Bauermann2018-03-251-1/+0Star
| * ima: drop vla in ima_audit_measurement()Tycho Andersen2018-03-251-6/+10
| * ima: Fix Kconfig to select TPM 2.0 CRB interfaceJiandi An2018-03-251-0/+1
| * evm: Constify *integrity_status_msg[]Hernán Gonzalez2018-03-231-1/+1
| * evm: Move evm_hmac and evm_hash from evm_main.c to evm_crypto.cHernán Gonzalez2018-03-233-4/+3Star
| * fuse: define the filesystem as untrustedMimi Zohar2018-03-231-0/+3
| * ima: fail signature verification based on policyMimi Zohar2018-03-235-7/+21
| * ima: clear IMA_HASHMimi Zohar2018-03-231-1/+1
| * ima: re-evaluate files on privileged mounted filesystemsMimi Zohar2018-03-231-2/+11
| * ima: fail file signature verification on non-init mounted filesystemsMimi Zohar2018-03-232-1/+16
| * IMA: Support using new creds in appraisal policyMatthew Garrett2018-03-238-30/+80
| * security: Add a cred_getsecid hookMatthew Garrett2018-03-235-0/+38
* | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2018-04-086-121/+250
|\ \
| * \ Merge tag 'tpmdd-next-20180323' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-03-236-121/+250
| |\ \ | | |/ | |/|
| | * tpm: fix intermittent failure with self testsJames Bottomley2018-03-233-40/+31Star
| | * tpm: add retry logicJames Bottomley2018-03-232-15/+61
| | * tpm: self test failure should not cause suspend to failChris Chiu2018-03-231-0/+4
| | * tpm2: add longer timeouts for creation commands.Tomas Winkler2018-03-233-13/+26
| | * tpm_crb: use __le64 annotated variable for response buffer addressTomas Winkler2018-03-231-2/+3
| | * tpm: fix buffer type in tpm_transmit_cmdWinkler, Tomas2018-03-232-5/+5
| | * tpm: tpm-interface: fix tpm_transmit/_cmd kdocWinkler, Tomas2018-03-231-2/+4
| | * tpm: cmd_ready command can be issued only after granting localityTomas Winkler2018-03-234-48/+120
| |/
* | Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2018-04-081-0/+2
|\ \
| * \ Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into ...James Morris2018-03-271-0/+2
| |\ \ | | |/ | |/|
| | * Smack: Handle CGROUP2 in the same way that CGROUPJosé Bollo2018-02-281-0/+2
* | | Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2018-04-073-11/+10Star
|\ \ \
| * | | alpha: get rid of pointless insn in ret_from_kernel_threadAl Viro2018-03-281-1/+0Star
| * | | alpha: switch pci syscalls to SYSCALL_DEFINEAl Viro2018-03-282-10/+10
* | | | Merge branch 'misc.sparc' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2018-04-079-181/+98Star
|\ \ \ \
| * | | | sparc: get rid of asm wrapper for nis_syscall()Al Viro2018-03-205-16/+5Star
| * | | | sparc: switch compat {f,}truncate64() to COMPAT_SYSCALL_DEFINEAl Viro2018-03-203-18/+12Star
| * | | | sparc: switch compat pread64 and pwrite64 to COMPAT_SYSCALL_DEFINEAl Viro2018-03-203-19/+13Star
| * | | | convert compat sync_file_range() to COMPAT_SYSCALL_DEFINEAl Viro2018-03-203-7/+8
| * | | | switch sparc_remap_file_pages() to SYSCALL_DEFINEAl Viro2018-03-203-5/+5
| * | | | sparc: get rid of memory_ordering(2) wrapperAl Viro2018-03-203-7/+3Star
| * | | | sparc: trivial conversions to {COMPAT_,}SYSCALL_DEFINE()Al Viro2018-03-204-22/+22
| * | | | sparc: bury a zombie extern that had been that way for twenty yearsAl Viro2018-03-201-2/+0Star
| * | | | sparc: get rid of remaining SIGN... wrappersAl Viro2018-03-204-52/+18Star
| * | | | sparc: kill useless SIGN... wrappersAl Viro2018-03-202-17/+7Star
| * | | | sparc: get rid of sys_sparc_pipe() wrappersAl Viro2018-03-205-16/+5Star
| |/ / /
* | | | treewide: fix up files incorrectly marked executableLinus Torvalds2018-04-072-0/+0
* | | | Merge branch 'i2c/for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-04-0728-765/+1964
|\ \ \ \
| * | | | i2c: add support for Socionext SynQuacer I2C controllerArd Biesheuvel2018-04-044-0/+685
| * | | | dt-bindings: i2c: add binding for Socionext SynQuacer I2CArd Biesheuvel2018-04-041-0/+29