summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-07 16:46:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-07 16:46:56 -0700
commit4b3f1a151571985f7c9964260db1c31e056a67e4 (patch)
tree34f4dcdd36dbeb8bf3c6919f9740dc65273ddd2e /security/smack
parent706ffc8c26432432fcd6d8a02708b40852bd0bd2 (diff)
parented807f6aaf787b83885a571268c5d803068f60a6 (diff)
downloadlinux-4b3f1a151571985f7c9964260db1c31e056a67e4.tar.bz2
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris: "This release contains only bug fixes. There are no new major features added" * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: tpm: fix intermittent failure with self tests tpm: add retry logic tpm: self test failure should not cause suspend to fail tpm2: add longer timeouts for creation commands. tpm_crb: use __le64 annotated variable for response buffer address tpm: fix buffer type in tpm_transmit_cmd tpm: tpm-interface: fix tpm_transmit/_cmd kdoc tpm: cmd_ready command can be issued only after granting locality
Diffstat (limited to 'security/smack')
0 files changed, 0 insertions, 0 deletions