From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Feb 2025 19:47:19 +0000 (-0800)
Subject: Merge tag 'integrity-v6.14-fix' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: ceph-for-6.15-rc4~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d62fdaf51b115f851dd151f7af054535890b5a0d;p=ceph-client.git

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

Pull integrity fixes from Mimi Zohar:
 "One bugfix and one spelling cleanup. The bug fix restores a
  performance improvement"

* tag 'integrity-v6.14-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: Reset IMA_NONACTION_RULE_FLAGS after post_setattr
  integrity: fix typos and spelling errors
---

d62fdaf51b115f851dd151f7af054535890b5a0d