From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Feb 2020 22:54:30 +0000 (-0800)
Subject: Merge tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd
X-Git-Tag: v5.10.7~3197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b72104b8c12504176fb5fc1442d6e54e31e338b;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd

Pull tpm fixes from Jarkko Sakkinen:
 "Two bug fixes"

* tag 'tpmdd-next-20200217' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST
  tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko.
---

2b72104b8c12504176fb5fc1442d6e54e31e338b