From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Jul 2020 20:26:00 +0000 (-0700)
Subject: Merge tag 'tpmdd-next-v5.8-rc5' of git://git.infradead.org/users/jjs/linux-tpmdd
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6bc851ffe0b246ab4f8aa0d01620fbc08d0441f;p=linux.git

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

a6bc851ffe0b246ab4f8aa0d01620fbc08d0441f