]> www.infradead.org Git - users/hch/configfs.git/commitdiff
projects / users / hch / configfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bfe91da 786a2aa)
Merge tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Jul 2020 20:26:00 +0000 (13:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Jul 2020 20:26:00 +0000 (13:26 -0700)
Pull tpm fix from Jarkko Sakkinen:
 "Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102").

  Removing IFX0102 from tpm_tis was not a right move because both
  tpm_tis and tpm_infineon use the same device ID.

  A real fix requires quirks added to both drivers. It can probably wait
  until v5.9 as the bug has existed since 2006"

* tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd:
  Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102")


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.