aboutsummaryrefslogtreecommitdiff
path: root/security/smack
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 13:25:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-25 13:25:18 -0700
commit52ff0779d6cfcce24c0204c22b0b4899dc55449d (patch)
tree76bc30ca328f4f6263426b6d5b1c530f91164eb7 /security/smack
parent57ce66d39f10fb01efabd72b14eb033deddb226b (diff)
parentb8d7b758145252e60ea0198e531a8b00a75b8895 (diff)
downloadlinux-52ff0779d6cfcce24c0204c22b0b4899dc55449d.tar.gz
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