From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Aug 2023 02:46:04 +0000 (-0700)
Subject: Merge tag 'tpmdd-v6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko... 
X-Git-Tag: v6.6.17~4220
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8de32cc060ba3f63171aaa0e8764d22d8c37978;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'tpmdd-v6.5-rc7' of git://git./linux/kernel/git/jarkko/linux-tpmdd

Pull tpm irq fixes from Jarkko Sakkinen:
 "These change the probing and enabling of interrupts advertised by the
  platform firmware (i.e. ACPI, Device Tree) to be an opt-in for tpm_tis,
  which can be set from the kernel command-line.

  Note that the opt-in change is only for the PC MMIO tpm_tis module. It
  does not affect other similar drivers using IRQs, like tpm_tis_spi and
  synquacer"

* tag 'tpmdd-v6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm_tis: Opt-in interrupts
  tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition
---

f8de32cc060ba3f63171aaa0e8764d22d8c37978