From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Dec 2025 17:45:23 +0000 (-0800)
Subject: Merge tag 'keys-trusted-next-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fc2cd2e4b398c57c9cf961cfea05eadbf34c05c;p=thirdparty%2Flinux.git

Merge tag 'keys-trusted-next-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull trusted key updates from Jarkko Sakkinen:

 - Remove duplicate 'tpm2_hash_map' in favor of 'tpm2_find_hash_alg()'

 - Fix a memory leak on failure paths of 'tpm2_load_cmd'

* tag 'keys-trusted-next-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: Fix a memory leak in tpm2_load_cmd
  KEYS: trusted: Replace a redundant instance of tpm2_hash_map
---

7fc2cd2e4b398c57c9cf961cfea05eadbf34c05c