From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 May 2024 17:48:35 +0000 (-0700)
Subject: Merge tag 'keys-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkk... 
X-Git-Tag: v6.10-rc1~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c73642cc5baea5b91bbb9b1f5fcd93672bfa08;p=thirdparty%2Fkernel%2Flinux.git

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

Pull keys updates from Jarkko Sakkinen:

 - do not overwrite the key expiration once it is set

 - move key quota updates earlier into key_put(), instead of updating
   them in key_gc_unused_keys()

* tag 'keys-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  keys: Fix overwrite of key expiration on instantiation
  keys: update key quotas in key_put()
---

25c73642cc5baea5b91bbb9b1f5fcd93672bfa08