]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd412e8 8322113)
Merge tag 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 15:31:03 +0000 (08:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 15:31:03 +0000 (08:31 -0700)
commit9e41b47e284ac86b2437de95c0cf11fe31043965
tree1cac75316c6ac183348aa39955726b061b5c15datree | snapshot
parentfd412e88c0a572e35ff6d8e174482ef9427b6b09commit | diff
parent83221131cf08646e4033f75069d31bab2c3a1989commit | diff
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
Linux Kernel Source Tree.