diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 18:31:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 18:31:03 +0300 |
| commit | 87f27e7b189f54a9e928efb4ea98bf375708ff1f (patch) | |
| tree | 1cac75316c6ac183348aa39955726b061b5c15da /security/integrity | |
| parent | 7dd1ce1a526cb444bd2308c9fda52add4c532ac1 (diff) | |
| parent | 60dc5f1bcfaa9cae9f99637e347d068cad7f8c9f (diff) | |
| download | linux-87f27e7b189f54a9e928efb4ea98bf375708ff1f.tar.xz | |
Merge tag 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd
Pull tpm fixes from James Bottomley:
"Fix a regression in the TPM trusted keys caused by the generic rework
to add ARM TEE based trusted keys.
Without this fix, the TPM trusted key subsystem fails to add or load
any keys"
* tag 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd:
KEYS: trusted: fix TPM trusted keys for generic framework
Diffstat (limited to 'security/integrity')
0 files changed, 0 insertions, 0 deletions