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)
commita6bc851ffe0b246ab4f8aa0d01620fbc08d0441f
treecfb8c253a31e948d7f004d3d0606e71b542461e8
parentbfe91da29bfad9941d5d703d45e29f0812a20724
parent786a2aa281f4c4ba424ea8b8ea1e85ab62c4a57c
Merge tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd

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")