From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Jan 2025 03:54:32 +0000 (-0800)
Subject: Merge tag 'integrity-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0ca0cf9f8cb16e3850e5242d68a1825d286e6a68;p=users%2Fdwmw2%2Flinux.git

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

Pull integrity updates from Mimi Zohar:
 "There's just a couple of changes: two kernel messages addressed, a
  measurement policy collision addressed, and one policy cleanup.

  Please note that the contents of the IMA measurement list is
  potentially affected. The builtin tmpfs IMA policy rule change might
  introduce additional measurements, while detecting a reboot might
  eliminate some measurements"

* tag 'integrity-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: ignore suffixed policy rule comments
  ima: limit the builtin 'tcb' dont_measure tmpfs policy rule
  ima: kexec: silence RCU list traversal warning
  ima: Suspend PCR extends and log appends when rebooting
---

0ca0cf9f8cb16e3850e5242d68a1825d286e6a68