From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Oct 2025 17:48:33 +0000 (-0700)
Subject: Merge tag 'integrity-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Tag: v6.18-rc1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=678074f1a8e03598977bdeea10a4ce51c4f4a0c4;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'integrity-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

Pull integrity updates from Mimi Zohar:
 "Just a couple of changes: crypto code cleanup and a IMA xattr bug fix"

* tag 'integrity-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: don't clear IMA_DIGSIG flag when setting or removing non-IMA xattr
  lib/digsig: Use SHA-1 library instead of crypto_shash
  integrity: Select CRYPTO from INTEGRITY_ASYMMETRIC_KEYS
---

678074f1a8e03598977bdeea10a4ce51c4f4a0c4