From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Apr 2018 23:46:56 +0000 (-0700)
Subject: Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: Ubuntu-5.13.0-19.19~11253
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4b3f1a151571985f7c9964260db1c31e056a67e4;p=mirror_ubuntu-jammy-kernel.git

Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull TPM updates from James Morris:
 "This release contains only bug fixes. There are no new major features
  added"

* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: fix intermittent failure with self tests
  tpm: add retry logic
  tpm: self test failure should not cause suspend to fail
  tpm2: add longer timeouts for creation commands.
  tpm_crb: use __le64 annotated variable for response buffer address
  tpm: fix buffer type in tpm_transmit_cmd
  tpm: tpm-interface: fix tpm_transmit/_cmd kdoc
  tpm: cmd_ready command can be issued only after granting locality
---

4b3f1a151571985f7c9964260db1c31e056a67e4