diff options
| author | Linus Torvalds <[email protected]> | 2020-07-07 20:26:00 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-07-07 20:26:00 +0000 |
| commit | a6bc851ffe0b246ab4f8aa0d01620fbc08d0441f (patch) | |
| tree | cfb8c253a31e948d7f004d3d0606e71b542461e8 /tools/perf/util/annotate.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | Revert commit e918e570415c ("tpm_tis: Remove the HID IFX0102") (diff) | |
| download | kernel-a6bc851ffe0b246ab4f8aa0d01620fbc08d0441f.tar.gz kernel-a6bc851ffe0b246ab4f8aa0d01620fbc08d0441f.zip | |
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")
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions