From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Oct 2023 05:41:52 +0000 (-1000)
Subject: Merge tag 'tpmdd-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux... 
X-Git-Tag: v6.7-rc1~168
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/b9ff774548cd91b45003b3b0d41f15cd52b25509

Merge tag 'tpmdd-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm updates from Jarkko Sakkinen:
 "This is a small sized pull request. One commit I would like to
  pinpoint is my fix for init_trusted() rollback, as for actual patch I
  did not receive any feedback"

* tag 'tpmdd-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  keys: Remove unused extern declarations
  integrity: powerpc: Do not select CA_MACHINE_KEYRING
  KEYS: trusted: tee: Refactor register SHM usage
  KEYS: trusted: Rollback init_trusted() consistently
---

b9ff774548cd91b45003b3b0d41f15cd52b25509