]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3cc4174 02ce5b4)
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)
commitd44b385813573915daed7d6181e89b8b93d5ab26
tree1cac75316c6ac183348aa39955726b061b5c15datree | snapshot
parent3cc417425dcb861ae12aba8172aec6d595e6a1f0commit | diff
parent02ce5b4c5fa75b3933ac952ed2c08e8789e7fe86commit | 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.