diff options
| author | Linus Torvalds | 2018-10-25 22:25:18 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2018-10-25 22:25:18 +0200 |
| commit | 52ff0779d6cfcce24c0204c22b0b4899dc55449d (patch) | |
| tree | 76bc30ca328f4f6263426b6d5b1c530f91164eb7 /security/smack | |
| parent | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge tag 'tpmdd-next-20181005' of git://git.infradead.org/users/jjs/linux-tp... (diff) | |
| download | kernel-qcow2-linux-52ff0779d6cfcce24c0204c22b0b4899dc55449d.tar.gz kernel-qcow2-linux-52ff0779d6cfcce24c0204c22b0b4899dc55449d.tar.xz kernel-qcow2-linux-52ff0779d6cfcce24c0204c22b0b4899dc55449d.zip | |
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris:
"From Jarkko: The only new feature is non-blocking operation for
/dev/tpm0"
* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: Restore functionality to xen vtpm driver.
tpm: add support for nonblocking operation
tpm: add ptr to the tpm_space struct to file_priv
tpm: Make SECURITYFS a weak dependency
tpm: suppress transmit cmd error logs when TPM 1.2 is disabled/deactivated
tpm: fix response size validation in tpm_get_random()
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions