summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2019-01-0216-1068/+1133
|\
| * Merge tag 'tpmdd-next-20181217' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-12-1716-1068/+1133
| |\
| | * tpm: add support for partial readsTadeusz Struk2018-12-172-19/+38
| | * tpm: tpm_ibmvtpm: fix kdoc warningsTomas Winkler2018-11-131-4/+2
| | * tpm: fix kdoc for tpm2_flush_context_cmd()Tomas Winkler2018-11-131-4/+3
| | * tpm: tpm_try_transmit() refactor error flow.Tomas Winkler2018-11-131-7/+8
| | * tpm: use u32 instead of int for PCR indexTomas Winkler2018-11-137-21/+24
| | * tpm1: reimplement tpm1_continue_selftest() using tpm_bufTomas Winkler2018-11-132-20/+10
| | * tpm1: reimplement SAVESTATE using tpm_bufTomas Winkler2018-11-131-10/+12
| | * tpm1: rename tpm1_pcr_read_dev to tpm1_pcr_read()Tomas Winkler2018-11-134-5/+5
| | * tpm1: implement tpm1_pcr_read_dev() using tpm_buf structureTomas Winkler2018-11-132-33/+23
| | * tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structureTomas Winkler2018-11-133-48/+49
| | * tpm: tpm-space.c remove unneeded semicolonTomas Winkler2018-11-131-1/+1
| | * tpm: tpm-interface.c drop unused macrosTomas Winkler2018-11-131-4/+0
| | * tpm: add tpm_auto_startup() into tpm-interface.cTomas Winkler2018-11-133-8/+19
| | * tpm: factor out tpm_startup functionTomas Winkler2018-11-134-45/+68
| | * tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.cTomas Winkler2018-11-133-50/+68
| | * tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.cTomas Winkler2018-11-136-151/+150
| | * tpm: factor out tpm1_get_random into tpm1-cmd.cTomas Winkler2018-11-133-51/+63
| | * tpm: move tpm_getcap to tpm1-cmd.cTomas Winkler2018-11-135-81/+71
| | * tpm: move tpm1_pcr_extend to tpm1-cmd.cTomas Winkler2018-11-133-28/+23
| | * tpm: factor out tpm_get_timeouts()Tomas Winkler2018-11-134-123/+135
| | * tpm: add tpm_calc_ordinal_duration() wrapperTomas Winkler2018-11-138-17/+25
| | * tpm: factor out tpm 1.x duration calculation to tpm1-cmd.cTomas Winkler2018-11-138-288/+320
| | * tpm: sort objects in the MakefileTomas Winkler2018-11-131-3/+12
| | * tpm2: add new tpm2 commands according to TCG 1.36Tomas Winkler2018-11-132-164/+118
| | * tpm: tpm_i2c_nuvoton: use correct command duration for TPM 2.xTomas Winkler2018-11-131-4/+7
* | | Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2019-01-022-3/+13
|\ \ \
| * \ \ Merge branch 'smack-for-4.21-a' of https://github.com/cschaufler/next-smack i...James Morris2018-12-132-3/+13
| |\ \ \
| | * | | Smack: Improve DocumentationJosé Bollo2018-12-131-0/+4
| | * | | smack: fix access permissions for keyringZoran Markovic2018-12-031-3/+9
| | | |/ | | |/|
* | | | block: don't use un-ordered __set_current_state(TASK_UNINTERRUPTIBLE)Linus Torvalds2019-01-023-9/+4
* | | | Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2019-01-0211-24/+1411
|\ \ \ \
| * \ \ \ Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel...James Morris2018-12-172-3/+2
| |\ \ \ \
| | * | | | seccomp, s390: fix build for syscall type changeTycho Andersen2018-12-131-1/+1
| | * | | | seccomp: fix poor type promotionTycho Andersen2018-12-131-2/+1
| * | | | | Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/k...James Morris2018-12-1210-23/+1411
| |\| | | | | | |/ / / | |/| | |
| | * | | samples: add an example of seccomp user trapTycho Andersen2018-12-113-1/+382
| | * | | seccomp: add a return code to trap to userspaceTycho Andersen2018-12-116-10/+1017
| | * | | seccomp: switch system call argument type to void *Tycho Andersen2018-12-113-6/+6
| | * | | seccomp: hoist struct seccomp_data recalculation higherTycho Andersen2018-12-111-6/+6
* | | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2019-01-0220-93/+861
|\ \ \ \ \
| * | | | | integrity: Remove references to module keyringThiago Jung Bauermann2018-12-172-4/+2
| * | | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2018-12-1720-92/+862
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | ima: Use inode_is_open_for_writeNikolay Borisov2018-12-121-1/+1
| | * | | | ima: Support platform keyring for kernel appraisalNayna Jain2018-12-121-2/+12
| | * | | | efi: Allow the "db" UEFI variable to be suppressedJosh Boyer2018-12-121-10/+35
| | * | | | efi: Import certificates from UEFI Secure BootJosh Boyer2018-12-122-1/+173
| | * | | | efi: Add an EFI signature blob parserDave Howells2018-12-123-1/+119
| | * | | | efi: Add EFI signature data typesDave Howells2018-12-121-0/+25
OpenPOWER on IntegriCloud