]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7dd1ce1 60dc5f1)
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)
commit87f27e7b189f54a9e928efb4ea98bf375708ff1f
tree1cac75316c6ac183348aa39955726b061b5c15datree
parent7dd1ce1a526cb444bd2308c9fda52add4c532ac1commit | diff
parent60dc5f1bcfaa9cae9f99637e347d068cad7f8c9fcommit | 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
Ubuntu combined Linux kernel mirror