| commit | 52ff0779d6cfcce24c0204c22b0b4899dc55449d | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 25 Oct 2018 20:25:18 +0000 (25 13:25 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 25 Oct 2018 20:25:18 +0000 (25 13:25 -0700) | ||
| tree | 76bc30ca328f4f6263426b6d5b1c530f91164eb7 | treesnapshot (tar.gz zip) |
| parent | 57ce66d39f10fb01efabd72b14eb033deddb226b | commitdiff |
| parent | b8d7b758145252e60ea0198e531a8b00a75b8895 | commitdiff |
Merge branch 'next-tpm' of git://git./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()
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()