Merge tag 'tpmdd-v6.4-rc1-fix-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2023 17:37:37 +0000 (10:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2023 17:37:37 +0000 (10:37 -0700)
commited9a65e575cc3c52a7f130d824671fe48a72da0c
tree8886b0cf2fea8e98d24c3ad9f7c91b329a05e014
parent58390c8ce1bddb6c623f62e7ed36383e7fa5c02f
parent0c8862de05c1a087795ee0a87bf61a6394306cc0
Merge tag 'tpmdd-v6.4-rc1-fix-v2' of git://git./linux/kernel/git/jarkko/linux-tpmdd

Pull tpm fix from Jarkko Sakkinen:
 "This fixes a critical bug in my first pull request.

  I fixed the cherry pick issue and tested with real hardare and
  libvirt/qemu plus swtpm"

* tag 'tpmdd-v6.4-rc1-fix-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm: Re-enable TPM chip boostrapping non-tpm_tis TPM drivers
drivers/char/tpm/tpm-chip.c
drivers/char/tpm/tpm.h