From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 May 2021 22:34:12 +0000 (-0700)
Subject: Merge tag 'tpmdd-next-v5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d02490ccdde9aef1ca57d5c87f8c20c2d6b1f5e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'tpmdd-next-v5.13-rc2' of git://git./linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fixes from Jarkko Sakkinen:
 "Bug fixes that have came up after the first pull request"

* tag 'tpmdd-next-v5.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: fix error return code in tpm2_get_cc_attrs_tbl()
  tpm, tpm_tis: Reserve locality in tpm_tis_resume()
  tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt()
  trusted-keys: match tpm_get_ops on all return paths
  KEYS: trusted: Fix memory leak on object td
---

8d02490ccdde9aef1ca57d5c87f8c20c2d6b1f5e