From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Jan 2025 03:47:17 +0000 (-0800)
Subject: Merge tag 'keys-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkk... 
X-Git-Tag: v6.14-rc1~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cb2bf599b2ce832127fa61fb430cc00a724d371;p=thirdparty%2Flinux.git

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

Pull keys updates from Jarkko Sakkinen.

Avoid using stack addresses for sg lists. And a cleanup.

* tag 'keys-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: dcp: fix improper sg use with CONFIG_VMAP_STACK=y
  keys: drop shadowing dead prototype
---

9cb2bf599b2ce832127fa61fb430cc00a724d371