projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58390c8 0c8862d)
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)
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

1  2 
drivers/char/tpm/tpm-chip.c patch | diff1 | diff2 | blob | history
drivers/char/tpm/tpm.h patch | diff1 | diff2 | blob | history

diff --cc drivers/char/tpm/tpm-chip.c
Simple merge
diff --cc drivers/char/tpm/tpm.h
Simple merge
Domain: System / Kernel;