From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Mar 2021 20:51:57 +0000 (-0800)
Subject: Merge tag 'tpmdd-next-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1595
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cb60ee6323968b694208c4cbd56a7176396e931;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull tpm fixes Jarkko Sakkinen:
 "Three fixes for rc2"

* tag 'tpmdd-next-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Remove unintentional dump_stack() call
  tpm, tpm_tis: Decorate tpm_tis_gen_interrupt() with request_locality()
  tpm, tpm_tis: Decorate tpm_get_timeouts() with request_locality()
---

3cb60ee6323968b694208c4cbd56a7176396e931