From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Apr 2021 15:31:03 +0000 (-0700)
Subject: Merge tag 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/tpmdd
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=87f27e7b189f54a9e928efb4ea98bf375708ff1f;p=linux.git

Merge tag 'queue' of git://git./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
---

87f27e7b189f54a9e928efb4ea98bf375708ff1f